历史数据-代码提交

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesHistorydataController.java

@@ -7,6 +7,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.ActOperation1;
 import com.ruoyi.system.domain.ActSuppliesHistorydata;
 import com.ruoyi.system.domain.ActSuppliesImportCleaningAcc;
+import com.ruoyi.system.model.HistorySaveDataModel;
 import com.ruoyi.system.service.IActSuppliesHistorydataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -200,5 +201,16 @@ public class ActSuppliesHistorydataController extends BaseController
         return getDataTable(actSuppliesImportCleaningAccs);
     }
 
+    @PreAuthorize("@ss.hasPermi('system.historydata.save')")
+    @PostMapping("/save")
+    public AjaxResult save(@RequestBody HistorySaveDataModel historySaveDataModel){
+        actSuppliesHistorydataService.saveHistoryData(historySaveDataModel);
+        return toAjax(1);
+    }
+    @PreAuthorize("@ss.hasPermi('system.historydata.selectData')")
+    @GetMapping("/select/data")
+    public TableDataInfo selectData(){
+        return getDataTable(actSuppliesHistorydataService.selectNewData());
+    }
 }
 

ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesCleaningRuleMapper.java

 package com.ruoyi.system.mapper;
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.*;
+import com.ruoyi.system.model.HistoryResonseDataModel;
+import com.ruoyi.system.model.HistorySaveDataModel;
 import com.ruoyi.system.model.SelActSuppliesDao;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -49,4 +52,8 @@ public interface ActSuppliesCleaningRuleMapper
     List<SelActSuppliesDao> selActSupplies();
 
     List<SelActSuppliesDao> selActSuppliesOne();
+
+    void saveHistoryData(@Param("data") HistorySaveDataModel historySaveDataModel, @Param("jsonString") String jsonString);
+
+    List<HistoryResonseDataModel> selectNewData();
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/model/HistoryResonseDataModel.java

+package com.ruoyi.system.model;
+
+import java.io.Serializable;
+
+public class HistoryResonseDataModel implements Serializable {
+
+    private String historyName;
+
+    private Object historyContent;
+
+    private String mining;;
+
+    private String templateId;
+
+    public String getHistoryName() {
+        return historyName;
+    }
+
+    public void setHistoryName(String historyName) {
+        this.historyName = historyName;
+    }
+
+    public Object getHistoryContent() {
+        return historyContent;
+    }
+
+    public void setHistoryContent(Object historyContent) {
+        this.historyContent = historyContent;
+    }
+
+    public String getMining() {
+        return mining;
+    }
+
+    public void setMining(String mining) {
+        this.mining = mining;
+    }
+
+    public String getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(String templateId) {
+        this.templateId = templateId;
+    }
+}

ruoyi-supplies/src/main/java/com/ruoyi/system/model/HistorySaveDataModel.java

+package com.ruoyi.system.model;
+
+
+
+import java.io.Serializable;
+import java.util.List;
+
+public class HistorySaveDataModel implements Serializable {
+
+    private String historyName;
+
+    private List<Object> historyContent;
+
+    private String mining;;
+
+    private String templateId;
+
+    public String getHistoryName() {
+        return historyName;
+    }
+
+    public void setHistoryName(String historyName) {
+        this.historyName = historyName;
+    }
+
+    public List<Object> getHistoryContent() {
+        return historyContent;
+    }
+
+    public void setHistoryContent(List<Object> historyContent) {
+        this.historyContent = historyContent;
+    }
+
+    public String getMining() {
+        return mining;
+    }
+
+    public void setMining(String mining) {
+        this.mining = mining;
+    }
+
+    public String getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(String templateId) {
+        this.templateId = templateId;
+    }
+}

ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesHistorydataService.java

@@ -2,9 +2,11 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.ActOperation1;
 import com.ruoyi.system.domain.ActSuppliesHistorydata;
 import com.ruoyi.system.domain.ActSuppliesImportCleaningAcc;
+import com.ruoyi.system.model.HistorySaveDataModel;
 
 /**
  *  历史数据Service接口
@@ -93,4 +95,8 @@ public interface IActSuppliesHistorydataService
     List<ActSuppliesHistorydata> selectActSuppliesHistorydataAcc(ActSuppliesHistorydata actSuppliesHistorydata);
 
     List<ActSuppliesImportCleaningAcc> selectActSuppliesCleaningCopyAcc(Long id);
+
+    void saveHistoryData(HistorySaveDataModel historySaveDataModel);
+
+    List<?> selectNewData();
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesHistorydataServiceImpl.java

 package com.ruoyi.system.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.google.gson.Gson;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -10,6 +13,7 @@ import com.ruoyi.system.domain.*;
 import com.ruoyi.system.mapper.ActSuppliesCleaningRuleMapper;
 import com.ruoyi.system.mapper.ActSuppliesDetailsMapper;
 import com.ruoyi.system.mapper.ActSuppliesHistorydataMapper;
+import com.ruoyi.system.model.HistorySaveDataModel;
 import com.ruoyi.system.service.IActSuppliesHistorydataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -929,5 +933,16 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
 
     }
 
+    @Override
+    public void saveHistoryData(HistorySaveDataModel historySaveDataModel) {
+        List<Object> historyContent = historySaveDataModel.getHistoryContent();
+        actSuppliesCleaningRuleMapper.saveHistoryData(historySaveDataModel,JSON.toJSONString(historyContent));
+    }
+
+    @Override
+    public List<?> selectNewData() {
+        return actSuppliesCleaningRuleMapper.selectNewData();
+    }
+
 
 }

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesCleaningRuleMapper.xml

@@ -54,10 +54,19 @@
     </select>
     <select id="selActSupplies" resultType="com.ruoyi.system.model.SelActSuppliesDao">
         select ds.code code, act.one_level oneLevel, act.two_level twoLevel, act.supplies_name suppliesName
-        from  act_supplies_details ds left join act_supplies act on act.id = ds.sid;
+        from act_supplies_details ds
+                 left join act_supplies act on act.id = ds.sid;
     </select>
     <select id="selActSuppliesOne" resultType="com.ruoyi.system.model.SelActSuppliesDao">
-        select one_level oneLevel, supplies_name suppliesName from act_supplies where two_level is null or two_level = ''
+        select one_level oneLevel, supplies_name suppliesName
+        from act_supplies
+        where two_level is null
+           or two_level = ''
+    </select>
+    <select id="selectNewData" resultType="com.ruoyi.system.model.HistoryResonseDataModel">
+        select template_id as templateId, history_name as historyName, history_content as historyContent, mining
+        from new_history_data_sheet
+        order by id desc
     </select>
 
 
@@ -684,7 +693,8 @@
     <delete id="deleteByMineIdAndDateColumn">
         delete
         from act_supplies_import_cleaning_copy1
-        where ssk_id =#{mineId} and hdate = #{dateColumn}
+        where ssk_id = #{mineId}
+          and hdate = #{dateColumn}
     </delete>
 
     <insert id="addInsertConvertAcc" parameterType="ActSuppliesImportTable" useGeneratedKeys="true" keyProperty="id">
@@ -857,6 +867,12 @@
             )
         </foreach>
     </insert>
+    <insert id="saveHistoryData">
+        Insert Into new_history_data_sheet (template_id, history_name, history_content, mining)
+        values (#{data.templateId}, #{data.historyName}, #{jsonString}, #{data.mining})
+    </insert>
+
+
 </mapper>