Merge branch 'V0.0.3' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.3

project_data/sql/0.0.3/soc/soc.sql

@@ -1209,7 +1209,7 @@ INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (120, 0172687555032455
 UPDATE sys_menu set menu_name='履职内容库' WHERE menu_name='履职内容库定义';
 UPDATE sys_menu set menu_name='检查内容库' WHERE menu_name='检查内容库定义';
 
-DELETE from sys_role_menu WHERE menu_id not in (SELECT id from sys_menu);
+
 
 -- 履职任务类型修正
 DELETE FROM sys_dict_data where dict_type='resumption_plan_type';
@@ -1360,6 +1360,12 @@ INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_cla
 VALUES (1, '过滤式消防自助呼吸器', '4', 'fire_fighting', null, 'default', 'N', '0', '超级管理员', now(), '', null, null);
 INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark)
 VALUES (2, '灭火器', '3', 'fire_fighting', null, 'default', 'N', '0', '超级管理员', now(), '', null, null);
+
+
+DELETE FROM `sys_dict_data` WHERE dict_code in (20231113208,20231113210);
+INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231113208, 3, '已逾期', '12', 'question_reform_status', NULL, 'default', 'N', '0', 'jwx', '2023-11-22 14:23:36', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231113210, 4, '已逾期', '4', 'question_confirm_status', NULL, 'default', 'N', '0', '超级管理员', '2023-11-22 17:28:29', '超级管理员', '2023-11-22 17:28:38', NULL);
+
 -- 删除多余的表
 drop TABLE if EXISTS sys_bank_physical_defense_construction;
 -- 新增演练项目字典,及修改字典排序
@@ -1452,20 +1458,14 @@ UPDATE `sys_menu` SET `menu_name` = '来访•核验',`order_num`=2  WHERE `menu
 
 -- 调整移动端菜单分组 开始
 UPDATE `sys_menu` SET `menu_name` = '来访•核验',`order_num`=2  WHERE `menu_name` = '来访' AND `parent_id` = 0 AND platform_type=0;
-DELETE FROM sys_menu WHERE id IN(01726899190588432386,01726899481861873666,01726900357129232386);
+DELETE FROM sys_menu WHERE id IN(01726899190588432386,01726899481861873666,01726900357129232386,01722798472651890689);
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01726899190588432386, '培训•演练', 0, 3, '‘’', NULL, NULL, 1, 0, 'M', '0', '0', NULL, '0', '#', NULL, '超级管理员', '2023-11-21 17:44:07', '', NULL, '');
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01726899481861873666, '设置•管理', 0, 4, '‘’', NULL, NULL, 1, 0, 'M', '0', '0', NULL, '0', '#', NULL, '超级管理员', '2023-11-21 17:45:17', '', NULL, '');
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01726900357129232386, '履职•检查', 0, 1, '‘’', NULL, NULL, 1, 0, 'M', '0', '0', NULL, '0','#', NULL, '超级管理员', '2023-11-21 17:48:45', '', NULL, '');
+INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01722798472651890689, 'app驾驶舱', 1726899481861873666, 1, '/cockpit', '', NULL, 1, 1, 'C', '0', '0', '', '0', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFYAAABWCAMAAABiiJHFAAAAMFBMVEVHcEymgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKUnf6aaAAAAD3RSTlMAQMCAYNAQIKAw8HDgsJCcvx8RAAAACXBIWXMAAAsSAAALEgHS3X78AAABwElEQVRYhe3Y2W6EMAwFUBICYR3//9+OCtMWTXKvTWAeqsbvPkLGztbUqFGjRmmMzsUPFM+LiHRDuNne2I0O/SdYkam9Dz6wX/A1zM3t6n3CinRjKRnnbyrDisxFaDg4WVaGAnQ5Ann2tDu+GYA96c7v6Yg94/Zrkg1Z+3/ruzQZs2Lss5zK2KVcZayY5i2fzNjJsKQ98qmMNXSDA5mUFW056xeQyFmtui1K5KzSDBEmclbp3aGUpVXop1LWMzZZYMysMDY7XzaWFBf/MJ11mA0XWLI84j7QWdIKpLRXWJK1saPDgRcx9sdoA/FAi9cfZPcVtSWBqkvZbnNZZ6OBoKzulrGqC8eXs5oLOxevthYXqXQ4VRdvZ3B/tLgrZEeVJS5ZGbXiMpdsD+CgZHHZScFQBeQ+CKv3AnTpoVEZNOzSc4LxczMu2XjN1U1d3LSv0Eci4xqO42z7PcRezJcbVLWJhpmQn4N9EOuNz1jeX9d4j2Q7yzH2CQjm26nNnZSmytTBUN+p4O0jqv3gy56AlP4tfv+JZI7XKw9sLn1V2GI4/a/ev7hNLpXdfMtTYAyDf/XF4h93Py/WqFHjH0TTNE8qcZLTHufPKAAAAABJRU5ErkJggg==', NULL, '超级管理员', '2023-11-10 10:08:58', '超级管理员', '2023-11-22 17:04:54', '');
 
 -- 修改改为禁用状态
-UPDATE `sys_menu` SET `status` = 1  WHERE `menu_name` = '管理' AND `parent_id` = 0 AND platform_type=0;
-UPDATE `sys_menu` SET `status` = 1  WHERE `menu_name` = '设备' AND `parent_id` = 0 AND platform_type=0;
-UPDATE `sys_menu` SET `status` = 1  WHERE `menu_name` = '履职' AND `parent_id` = 0 AND platform_type=0;
-UPDATE `sys_menu` SET `status` = 1  WHERE `menu_name` = '培训' AND `parent_id` = 0 AND platform_type=0;
-UPDATE `sys_menu` SET `status` = 1  WHERE `menu_name` = '演练' AND `parent_id` = 0 AND platform_type=0;
-UPDATE `sys_menu` SET `status` = 1  WHERE `menu_name` = '驾驶舱App' AND `parent_id` = 0 AND platform_type=0;
-
-DELETE FROM sys_role_menu where menu_id IN (SELECT id FROM sys_menu WHERE (`menu_name` = '管理' OR `menu_name` = '设备' OR `menu_name` = '驾驶舱App' OR `menu_name` = '培训' OR `menu_name` = '演练' OR`menu_name` = '履职' ) AND `parent_id` = 0 AND platform_type = 0 );
+DELETE from `sys_menu` WHERE  `parent_id` = 0 AND platform_type=0 and  `menu_name` in ('管理','设备','履职','培训','演练','驾驶舱App'); 
 
 -- 修改移动端菜单目录
 
@@ -1486,4 +1486,6 @@ SET parent_id = 01726900357129232386
 WHERE
         parent_id IN ( SELECT * FROM ( SELECT id FROM sys_menu WHERE `menu_name` = '履职' AND `parent_id` = 0 AND platform_type = 0 ) AS s );
 
--- 调整移动端菜单分组 结束
+-- 在权限表中删除没有菜单的数据
+DELETE from sys_role_menu WHERE menu_id not in (SELECT id from sys_menu);
+-- 调整移动端菜单分组 结束

soc-auth/src/main/java/com/xunmei/auth/controller/VersionController.java

@@ -0,0 +1,21 @@
+package com.xunmei.auth.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author gaoxiong
+ * @Title: 获取当前服务是否在线
+ * @Package
+ * @Description:
+ * @date 2023/11/2217:55
+ */
+@Controller
+@RequestMapping("/version")
+public class VersionController {
+
+    @RequestMapping
+    public String getVersion(){
+        return "未设置";
+    }
+}

soc-gateway/src/main/java/com/xunmei/gateway/controller/VersionController.java

@@ -0,0 +1,21 @@
+package com.xunmei.gateway.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author gaoxiong
+ * @Title: 获取当前服务是否在线
+ * @Package
+ * @Description:
+ * @date 2023/11/2217:55
+ */
+@Controller
+@RequestMapping("/version")
+public class VersionController {
+
+    @RequestMapping
+    public String getVersion(){
+        return "未设置";
+    }
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/controller/VersionController.java

@@ -0,0 +1,21 @@
+package com.xunmei.core.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author gaoxiong
+ * @Title: 获取当前服务是否在线
+ * @Package
+ * @Description:
+ * @date 2023/11/2217:55
+ */
+@Controller
+@RequestMapping("/version")
+public class VersionController {
+
+    @RequestMapping
+    public String getVersion(){
+        return "未设置";
+    }
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/QuestionConfirmEnum.java

@@ -17,7 +17,13 @@ public enum QuestionConfirmEnum {
     /**
      * 已关闭
      */
-    Closed;
+    Closed,
+    /**
+     * 已逾期
+     */
+    OverDue;
+
+
 
     public Integer getValue(){
         return  this.ordinal();

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/QuestionReformEnum.java

@@ -2,7 +2,11 @@ package com.xunmei.core.question;
 
 public enum QuestionReformEnum {
     Unreform(10),
-    Reformed(11);
+    Reformed(11),
+    /**
+     * 已逾期
+     */
+    OverDue(12);
 
     private Integer value;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/domain/Question.java

@@ -2,6 +2,7 @@ package com.xunmei.core.question.domain;
 
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -140,6 +141,10 @@ public class Question extends BaseEntity {
     @ApiModelProperty(value = "整改状态。10未整改，11已整改")
     private Integer reformStatus;
 
+    @ApiModelProperty(value = "逾期状态值")
+    @TableField(exist = false)
+    private Integer overdueStatus;
+
     /**
      * 整改期限
      */

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/service/IQuestionReformService.java

@@ -44,8 +44,8 @@ public interface IQuestionReformService extends IService<Question> {
      */
     void export(ReformPageDto pageDto, HttpServletResponse response) throws Exception;
 
-    /**
-     * 更新整改逾期状态
-     */
-    void updateReformOverdueState();
+//    /**
+//     * 更新整改逾期状态
+//     */
+//    void updateReformOverdueState();
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/service/impl/QuestionReformServiceImpl.java

@@ -82,8 +82,14 @@ public class QuestionReformServiceImpl extends ServiceImpl<QuestionMapper, Quest
             wrapper.eq(Question::getOrgId, query.getOrgId());
         }
         wrapper.ge(Question::getConfirmStatus, 2);
+        wrapper.isNotNull(Question::getReformStatus);
         if (ObjectUtil.isNotEmpty(query.getReformStatus())) {
-            wrapper.eq(Question::getReformStatus, query.getReformStatus());
+            if(ObjectUtil.equal(query.getReformStatus(),QuestionReformEnum.OverDue.getValue())){
+                wrapper.ne(Question::getConfirmStatus, QuestionConfirmEnum.Closed.getValue());
+                wrapper.lt(Question::getReformDeadline,DateUtil.beginOfDay(new Date()));
+            }else{
+                wrapper.eq(Question::getReformStatus, query.getReformStatus());
+            }
         }
 
         //时间范围查询
@@ -108,6 +114,13 @@ public class QuestionReformServiceImpl extends ServiceImpl<QuestionMapper, Quest
         wrapper.orderByDesc(Question::getId);
         //获取数据
         page = baseMapper.selectPage(page, wrapper);
+        page.getRecords().forEach(r -> {
+            if (ObjectUtil.notEqual(r.getConfirmStatus(), QuestionConfirmEnum.Closed.getValue()) &&
+                    r.getReformDeadline().before(DateUtil.beginOfDay(new Date()))) {
+                //任务未结束并且过了整改结束日期
+                r.setOverdueStatus(QuestionReformEnum.OverDue.getValue());
+            }
+        });
 //        Page<QuestionPageDto> r =page.
         //抓换为TableDataInfo适配前端
         return TableDataInfo.build(page);
@@ -186,12 +199,12 @@ public class QuestionReformServiceImpl extends ServiceImpl<QuestionMapper, Quest
         EasyExcel.write(response.getOutputStream(), QuestionExportDto.class).sheet("Sheet1").doWrite(list);
     }
 
-    /**
-     * 更新整改逾期状态
-     */
-    @Override
-    public void updateReformOverdueState(){
+//    /**
+//     * 更新整改逾期状态
+//     */
+//    @Override
+//    public void updateReformOverdueState(){
 //        LambdaUpdateWrapper<Question> wrapper=new LambdaUpdateWrapper();
 //        wrapper.ge(Question::getConfirmStatus)
-    }
+//    }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/service/impl/QuestionServiceImpl.java

@@ -78,11 +78,12 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         }
 
         if (ObjectUtil.isNotEmpty(query.getConfirmStatus())) {
-//            if (ObjectUtil.equal(query.getConfirmStatus(), 2)) {
-//                wrapper.gt(Question::getConfirmStatus, query.getConfirmStatus());
-//            } else {
-            wrapper.eq(Question::getConfirmStatus, query.getConfirmStatus());
-//            }
+            if (ObjectUtil.equal(query.getConfirmStatus(), QuestionConfirmEnum.OverDue.getValue())) {
+                wrapper.ne(Question::getConfirmStatus, QuestionConfirmEnum.Closed.getValue());
+                wrapper.lt(Question::getReformDeadline, DateUtil.beginOfDay(new Date()));
+            } else {
+                wrapper.eq(Question::getConfirmStatus, query.getConfirmStatus());
+            }
         }
 
 
@@ -116,6 +117,13 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         wrapper.orderByDesc(Question::getId);
         //获取数据
         page = baseMapper.selectPage(page, wrapper);
+        page.getRecords().forEach(r -> {
+            if (ObjectUtil.notEqual(r.getConfirmStatus(), QuestionConfirmEnum.Closed.getValue()) &&
+                    r.getReformDeadline().before(DateUtil.beginOfDay(new Date()))) {
+                //任务未结束并且过了整改结束日期
+                r.setOverdueStatus(QuestionConfirmEnum.OverDue.getValue());
+            }
+        });
 //        Page<QuestionPageDto> r =page.
         //抓换为TableDataInfo适配前端
         return TableDataInfo.build(page);
@@ -221,7 +229,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         updateWrapper.eq(Question::getId, confirmDto.getId());
         if (ObjectUtil.equal(confirmDto.getStatus(), 0)) {
             updateWrapper.set(Question::getConfirmStatus, QuestionConfirmEnum.Confirmed.getValue())
-                    .set(Question::getReformStatus,QuestionReformEnum.Unreform.getValue());
+                    .set(Question::getReformStatus, QuestionReformEnum.Unreform.getValue());
         } else {
             updateWrapper.set(Question::getConfirmStatus, QuestionConfirmEnum.Dissent.getValue());
         }
@@ -264,7 +272,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                     .set(Question::getReformStatus, null);
         } else {
             updateWrapper.set(Question::getConfirmStatus, QuestionConfirmEnum.Confirmed.getValue())
-                    .set(Question::getReformStatus,QuestionReformEnum.Unreform.getValue());
+                    .set(Question::getReformStatus, QuestionReformEnum.Unreform.getValue());
         }
 
         questionFlowMapper.insert(flow);
@@ -274,7 +282,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRES_NEW)
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
     public void selectQuestionExceptionData(Date startTime, Date endTime, List<Long> orgIds) {
         //baseMapper.selectQuestionExceptionData(startTime, endTime, orgIds);
         baseMapper.saveQuestionExceptionData(startTime, endTime, orgIds);
@@ -289,7 +297,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
             pageDto.setSubmitRange(nd);
         }
         List<QuestionExportDto> list = baseMapper.selectQuestionExportList(pageDto);
-        Integer index=1;
+        Integer index = 1;
         for (QuestionExportDto questionExportDto : list) {
             questionExportDto.setIndex(index++);
         }

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/controller/VersionController.java

@@ -0,0 +1,21 @@
+package com.xunmei.file.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author gaoxiong
+ * @Title: 获取当前服务是否在线
+ * @Package
+ * @Description:
+ * @date 2023/11/2217:55
+ */
+@Controller
+@RequestMapping("/version")
+public class VersionController {
+
+    @RequestMapping
+    public String getVersion(){
+        return "未设置";
+    }
+}

soc-modules/soc-modules-job/src/main/java/com/xunmei/job/controller/VersionController.java

@@ -0,0 +1,21 @@
+package com.xunmei.job.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author gaoxiong
+ * @Title: 获取当前服务是否在线
+ * @Package
+ * @Description:
+ * @date 2023/11/2217:55
+ */
+@Controller
+@RequestMapping("/version")
+public class VersionController {
+
+    @RequestMapping
+    public String getVersion(){
+        return "未设置";
+    }
+}

soc-modules/soc-modules-sync/src/main/java/com/xunmei/sync/controller/VersionController.java

@@ -0,0 +1,21 @@
+package com.xunmei.sync.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author gaoxiong
+ * @Title: 获取当前服务是否在线
+ * @Package
+ * @Description:
+ * @date 2023/11/2217:55
+ */
+@Controller
+@RequestMapping("/version")
+public class VersionController {
+
+    @RequestMapping
+    public String getVersion(){
+        return "未设置";
+    }
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/VersionController.java

@@ -0,0 +1,21 @@
+package com.xunmei.system.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author gaoxiong
+ * @Title: 获取当前服务是否在线
+ * @Package
+ * @Description:
+ * @date 2023/11/2217:55
+ */
+@Controller
+@RequestMapping("/version")
+public class VersionController {
+
+    @RequestMapping
+    public String getVersion(){
+        return "未设置";
+    }
+}