Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActOperation1.java
#	ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesImportCleaning.java
#	ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesHistorydataMapper.java
#	ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesCleaningRuleMapper.xml
#	ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesHistorydataMapper.xml
#	ruoyi-ui/src/views/system/supplies/index.vue
#	ruoyi-ui/src/views/system/suppliesroledetail/index.vue

ruoyi-admin/src/main/resources/application-dev.yml

@@ -3,6 +3,7 @@ spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver
+
         druid:
             # 主库数据源
 #            master:
@@ -59,3 +60,4 @@ spring:
                 wall:
                     config:
                         multi-statement-allow: true
+

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://192.168.111.222:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                url: jdbc:mysql://192.168.111.222:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: password
             # 从库数据源

ruoyi-admin/src/main/resources/application.yml

@@ -102,7 +102,7 @@ token:
     # 令牌密钥
     secret: lBfBaGlDjWpLgJbBeCcJaBhAsC  #abcdefghijklmnopqrstuvwxyz
     # 令牌有效期（默认30分钟）
-    expireTime: 30
+    expireTime: 300
 
 # MyBatis配置
 mybatis:

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

@@ -102,7 +102,7 @@ public class ActClassificationController extends BaseController
     /**
      * 删除分配信息
      */
-    @PreAuthorize("@ss.hasPermi('ActClassification:ActClassification:remove')")
+    @PreAuthorize("@ss.hasPermi('ActClassification :ActClassification:remove')")
     @Log(title = "分配信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -142,10 +142,11 @@ public class ActClassificationController extends BaseController
 
         actClassificationService.setDisable(id,status);
 
-        if(status > 1){
+        if (status > 1 ){
             return AjaxResult.error(ServiceCode.ERR_CODE+"","禁用失败");
+        }else {
+            return AjaxResult.success(ServiceCode.OK+"","禁用成功");
         }
-        return AjaxResult.success("200","禁用成功");
 
     }
 

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

@@ -150,16 +150,18 @@ public class ActSuppliesController extends BaseController
      * 禁用物料总分类管理
      */
     @PreAuthorize("@ss.hasPermi('Actsupplies:Actsupplies:Disable')")
+    @PutMapping("/{id}/Disable")
     public AjaxResult setDisable(@PathVariable("id") Long id, @RequestParam("status") Integer status) {
 
         if (actSuppliesService.find(id).size() > 0 || actSuppliesService.findId(id).size() > 0) {
 
         }
             actSuppliesService.setDisable(id, status);
-            if (status > 1) {
-                return AjaxResult.error(ServiceCode.ERR_CODE + "", "禁用失败");
+        if (status > 1){
+            return AjaxResult.error(ServiceCode.ERR_CODE+"","禁用失败");
+        }else {
+            return AjaxResult.success(ServiceCode.OK+"","禁用成功");
         }
-            return AjaxResult.success("200", "禁用成功");
 
     }
 

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

@@ -160,7 +160,7 @@ public class ActSuppliesDetailsController extends BaseController
      * 启用物料细分类管理
      */
     @PreAuthorize("@ss.hasPermi('ActSuppliesDetails:ActSuppliesDetails:enable')")
-    @GetMapping("/{id}/enable")
+    @PutMapping("/{id}/enable")
     public AjaxResult setEnable(@PathVariable("id") Long id, @RequestParam("status") Integer status)
     {
 
@@ -176,7 +176,7 @@ public class ActSuppliesDetailsController extends BaseController
      * 禁用物料细分类管理
      */
     @PreAuthorize("@ss.hasPermi('ActSuppliesDetails:ActSuppliesDetails:Disable')")
-    @GetMapping("/{id}/disable")
+    @PutMapping("/{id}/disable")
     public AjaxResult setDisable(@PathVariable("id") Long id, @RequestParam("status") Integer status)
     {
 

ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActClassification.java

@@ -38,7 +38,7 @@ public class ActClassification extends BaseEntity
 
     /** 状态 */
     @Excel(name = "状态",readConverterExp="0=启用,1=禁用")
-    private String status;
+    private Integer status;
 
     public void setId(Long id) 
     {
@@ -67,12 +67,12 @@ public class ActClassification extends BaseEntity
     {
         return pid;
     }
-    public void setStatus(String status) 
+    public void setStatus(Integer status)
     {
         this.status = status;
     }
 
-    public String getStatus() 
+    public Integer getStatus()
     {
         return status;
     }

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

@@ -349,6 +349,52 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
                 }
 
 
+
+
+                for (int i = 0; i < actOperation2s.size(); i++) {
+
+                    //获取导入excel表数据存储到生成表实体类中
+                    for (int x = 0; x < actOperation2s.get(i).getActOperation2().length; x++) {
+                        //判断数据是否为空，为空结束循环
+                        if (actOperation2s.get(i).getActOperation2()[x] != null) {
+                            ActSuppliesImportCleaning actSuppliesImportCleaning = new ActSuppliesImportCleaning();
+
+                            UUID uuid = UUID.randomUUID();
+                            String s = StringUtils.remove(uuid.toString(), '-');
+                            actSuppliesImportCleaning.setId(s);
+                            actSuppliesImportCleaning.setRoleId(actOperation2s.get(i).gethId());
+                            actSuppliesImportCleaning.setDate(actOperation2s.get(i).gethDate());
+                            actSuppliesImportCleaning.setSskId(actOperation2s.get(i).getMining());
+                            //获取数组x行的真实非空长度
+                            List<Object> actOperation2s1 = Arrays.asList(actOperation2s.get(i).getActOperation2()[x]);
+                            long count = Arrays.stream(actOperation2s.get(i).getActOperation2()[x]).filter(Objects::nonNull).count();
+
+                            //循环保存到实体类字段中
+                            for (int y = 0; y < count; y++) {
+                                if (actOperation2s.get(i).getActOperation2()[x][y] != null) {
+                                    if (actOperation2s.get(i).getActOperation2()[x][y].getV() != null) {
+                                        //[{"HeaderRow": 1, "CodeColumn": 6, "DateColumn": 5, "NameColumn": 7, "MoneyColumn": 12, "NumberColumn": 11, "DepartmentColumn": 2}]
+                                        JSONArray parse = (JSONArray) JSONArray.parse(actOperation2s.get(i).getHistoryRole());
+                                        actSuppliesImportCleaning.setNameColumn(actOperation2s.get(i).getActOperation2()[x][(int) parse.getJSONObject(0).get("NameColumn")-1].getV());
+                                        actSuppliesImportCleaning.setCodeColumn(actOperation2s.get(i).getActOperation2()[x][(int) parse.getJSONObject(0).get("CodeColumn")-1].getV());
+                                        actSuppliesImportCleaning.setDepartmentColumn(actOperation2s.get(i).getActOperation2()[x][(int) parse.getJSONObject(0).get("DepartmentColumn")-1].getV());
+                                        actSuppliesImportCleaning.setNumberColumn(actOperation2s.get(i).getActOperation2()[x][(int) parse.getJSONObject(0).get("NumberColumn")-1].getV());
+                                        actSuppliesImportCleaning.setMoneyColumn(actOperation2s.get(i).getActOperation2()[x][(int) parse.getJSONObject(0).get("MoneyColumn")-1].getV());
+                                        actSuppliesImportCleaning.setDateColumn(actOperation2s.get(i).getActOperation2()[x][(int) parse.getJSONObject(0).get("DateColumn")-1].getV());
+                                    }
+                                }
+
+                            }
+                            //新增一条生成表数据
+                            actSuppliesCleaningRuleMapper.addActSuppliesImportCleaning(actSuppliesImportCleaning);
+                        } else {
+                            break;
+                        }
+
+                    }
+                }
+
+
                 String[] attributes = new String[200];
 
                 for(int i=1;i<=200;i++){

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

@@ -39,13 +39,13 @@
     </select>
 
     <update id="setEnable" parameterType="java.util.Map">
-        UPDATE ActClassification
+        UPDATE act_classification
         SET status = 0
         WHERE id = #{id}
     </update>
 
     <update id="setDisable" parameterType="java.util.Map">
-        UPDATE ActClassification
+        UPDATE act_classification
         SET status = 1
         WHERE id = #{id}
     </update>

ruoyi-ui/src/api/ActClassification/ActClassification.js

@@ -7,6 +7,7 @@ export function listActClassification(query) {
     method: 'get',
     params: query
   })
+
 }
 
 //查询上级ID

ruoyi-ui/src/api/ActSuppliesDetails/ActSuppliesDetails.js

@@ -70,14 +70,14 @@ export function exportActSuppliesDetails(query) {
 //启用
 export function toggleEnable(id) {
     return request({
-        url: `/Actsupplies/Actsupplies/${id}/enable?status=0`,
+        url: `/ActSuppliesDetails/ActSuppliesDetails/${id}/enable?status=0`,
         method: 'put',
     })
 }
 //禁用
 export function toggleDisable(id) {
     return request({
-        url: `/Actsupplies/Actsupplies/${id}/disable?status=1`,
+        url: `/ActSuppliesDetails/ActSuppliesDetails/${id}/disable?status=1`,
         method: 'put',
     })
 }

ruoyi-ui/src/api/Actsupplies/Actsupplies.js

@@ -52,19 +52,17 @@ export function delSupplies(id) {
 }
 
 //启用
-  export function toggleEnable(id) {
+export function toggleEnable(id) {
     return request({
-      url: '/Actsupplies/Actsupplies/enable/' +id,
-      method: 'get',
-
+        url: `/Actsupplies/Actsupplies/${id}/enable?status=0`,
+        method: 'put',
     })
-  }
+}
 //禁用
 export function toggleDisable(id) {
     return request({
-    url: '/Actsupplies/Actsupplies/disable/' +id,
-    method: 'get',
-
+        url: `/Actsupplies/Actsupplies/${id}/Disable?status=1`,
+        method: 'put',
     })
 }
 

ruoyi-ui/src/views/system/ActClassification/index.vue

@@ -205,7 +205,7 @@ export default {
                 pageSize: 10,
                 name: null,
                 pid: null,
-                status: null,
+                status: 0,
             },
             // 表单参数
             form: {},
@@ -231,6 +231,7 @@ export default {
                 toggleEnable(ActClassification.id).then((response) =>{
 
                     if(response.code === 200){
+
                         let message = '操作成功，已经将【' + ActClassification.name +'】的状态改为【'+ enableText[ActClassification.status] +'】 !';
                         this.$message({
                             message: message,
@@ -250,7 +251,7 @@ export default {
                         });
                     }else {
                         this.getList();
-                        this.$message.error(response.code);
+                        this.$message.error(response.message);
                     }
                 });
             }

ruoyi-ui/src/views/system/ActSuppliesDetails/ActSuppliesDetails/index.vue

@@ -382,14 +382,14 @@ export default {
                 });
             }else {
                 toggleDisable(actSuppliesDetails.id).then((response) =>{
-                    if(response.msg === "200"){
+                    if(response.code === 200){
                         let message = '操作成功，已经将【' + actSuppliesDetails.detailsName +'】的状态改为【'+ enableText[actSuppliesDetails.status] +'】 !';
                         this.$message({
                             message: message,
                             type:'error'
                         });
                     }else {
-                        this.$message.error(response.msg);
+                        this.$message.error(response.message);
                     }
                 });
             }

ruoyi-ui/src/views/system/Actsupplies/Actsupplies/index.vue

@@ -236,7 +236,7 @@
 </template>
 
 <script>
-import { listSupplies, toggleEnable,toggleDisable,getSupplies, delSupplies, addSupplies, updateSupplies, exportSupplies ,getLevel } from "@/api/Actsupplies/Actsupplies";
+import { listSupplies,toggleEnable,toggleDisable,getSupplies, delSupplies, addSupplies, updateSupplies, exportSupplies ,getLevel } from "@/api/Actsupplies/Actsupplies";
 import request from "@/utils/request";
 
 export default {
@@ -374,6 +374,7 @@ export default {
             // const pageNumber = this.queryParams.pageNum || 1;
             return  index + 1;
         },
+
         /**启用 */
         toggleEnable(actSupplies){
             console.log('你点击了【' + actSupplies.suppliesName+'】的开关控件，当前开关值:' + actSupplies.status);
@@ -389,29 +390,28 @@ export default {
                     }else {
                         this.$message.error(response.message);
                     }
-
                 });
             }else {
                 toggleDisable(actSupplies.id).then((response) =>{
-                    if(response.msg === "200"){
-                        let message = '操作成功，已经将【' + actSupplies.suppliesName +'】的状态改为【'+ enableText[actSupplies.status] +'】 !';
-                        this.$message({
-
 
+                    if(response.code === 200){
 
+                        let message = '操作成功，已经将【' + actSupplies.suppliesName +'】的状态改为【'+ enableText[actSupplies.status] +'】 !';
+                        this.$message({
                             message: message,
                             type:'error'
                         });
                     }else {
                         this.getList();
-                        this.$message.error(response.msg);
+                        this.$message.error(response.message);
                     }
-
                 });
             }
         },
 
 
+
+
         /** 查询上级关联关系*/
         fetchOptions() {
 
@@ -430,9 +430,7 @@ export default {
                     }
                 }
             });
-
         },
-
         /** 查询物料总分类管理列表 */
         getList() {
             this.indexMethod(0);

ruoyi-ui/vue.config.js

@@ -28,7 +28,7 @@ module.exports = {
   productionSourceMap: false,
   // webpack-dev-server 相关配置
   devServer: {
-    host: '0.0.0.0',
+    // host: '0.0.0.0',
     port: port,
     open: true,
     proxy: {