feats

db/.back_文明创办/文明创办-backup-202312152442.pdma.json → db/.back_文明创办/文明创办-backup-202312223659.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.2.0",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-1-2 14:06:29",
+  "updatedTime": "2023-1-2 20:52:56",
   "dbConns": [],
   "profile": {
     "default": {
@@ -3711,7 +3711,7 @@
         {
           "defKey": "validate_status",
           "defName": "审核状态",
-          "comment": "0未审核,1审核通过,2审核不通过",
+          "comment": "0未审核,1审核提交,2审核通过,3审核不通过",
           "type": "",
           "len": "",
           "scale": "",
@@ -7980,6 +7980,290 @@
       ],
       "correlations": [],
       "indexes": []
+    },
+    {
+      "id": "430EE745-314D-48CE-A20B-ED2C4D79BC92",
+      "env": {
+        "base": {
+          "nameSpace": "com.example.civilizedcity",
+          "codeRoot": "TaMessage"
+        },
+        "template": {
+          "JavaMybatisPlus": {
+            "Controller": {
+              "suffix": "controller/{{=it.codeRoot}}Controller.java",
+              "enable": true
+            },
+            "Service": {
+              "suffix": "service/{{=it.codeRoot}}Service.java",
+              "enable": true
+            },
+            "ServiceImpl": {
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java",
+              "enable": true
+            },
+            "Mapper": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java",
+              "enable": true
+            },
+            "Mapper.xml": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml",
+              "enable": true
+            },
+            "Entity": {
+              "suffix": "entity/{{=it.codeRoot}}.java",
+              "enable": true
+            }
+          }
+        },
+        "custom": {}
+      },
+      "defKey": "ta_message",
+      "defName": "消息通知",
+      "comment": "",
+      "properties": {},
+      "nameTemplate": "{defKey}[{defName}]",
+      "notes": {},
+      "headers": [
+        {
+          "refKey": "hideInGraph",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "defKey",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "defName",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "primaryKey",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "notNull",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "autoIncrement",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "domain",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "type",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "len",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "scale",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "comment",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "refDict",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "defaultValue",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "isStandard",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "uiHint",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "extProps",
+          "hideInGraph": true
+        }
+      ],
+      "fields": [
+        {
+          "defKey": "msg_id",
+          "defName": "ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": true,
+          "notNull": true,
+          "autoIncrement": true,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "refDict": "",
+          "uiHint": "",
+          "id": "FC7B9B05-7D57-4818-8266-F8A4D62DB212"
+        },
+        {
+          "defKey": "title",
+          "defName": "消息标题",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "CBA249ED-8EBD-4352-843D-7F6593CFE0CA"
+        },
+        {
+          "defKey": "content",
+          "defName": "消息内容",
+          "comment": "",
+          "type": "TEXT",
+          "len": 0,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "C333DA5B-4402-4455-BC1A-156E0F7171CE"
+        },
+        {
+          "defKey": "target_type",
+          "defName": "关联内容",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "402577E1-743E-42F4-976B-984FEEBAF594"
+        },
+        {
+          "defKey": "target_id",
+          "defName": "关联内容ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "D67DAC89-0B94-42B6-AB35-C048092E53BC"
+        },
+        {
+          "defKey": "receive_user",
+          "defName": "接收人员",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "BA7C44C3-6332-4808-B8A1-9CA4A0230B8C"
+        },
+        {
+          "defKey": "org_id",
+          "defName": "机构ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "FBCA3E18-1ABB-4B48-8370-9A9FB679B5A7",
+          "uiHint": ""
+        },
+        {
+          "defKey": "status",
+          "defName": "状态",
+          "comment": "",
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "1",
+          "hideInGraph": true,
+          "refDict": "",
+          "uiHint": "",
+          "id": "E1646EEB-D7B3-4C90-91B1-C5D45348549C"
+        },
+        {
+          "defKey": "create_user",
+          "defName": "创建人",
+          "comment": "",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "refDict": "",
+          "uiHint": "",
+          "id": "210ABBCB-0350-4D79-B4E4-92543A825036"
+        },
+        {
+          "defKey": "create_date",
+          "defName": "创建时间",
+          "comment": "",
+          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "CURRENT_TIMESTAMP",
+          "hideInGraph": true,
+          "refDict": "",
+          "uiHint": "",
+          "id": "5BCAB4B5-D041-4F14-8AC8-991595EB1EA5"
+        }
+      ],
+      "correlations": [],
+      "indexes": []
     }
   ],
   "views": [],
@@ -8407,7 +8691,8 @@
         "3B58B8CA-AF26-40FE-907A-A34523419478",
         "B20E272F-91EB-4BAC-AAD6-AF99D517E44D",
         "EF3D4E17-6CE0-4944-B1DC-40280B2B689F",
-        "5BEE62BD-F04C-49E8-A65A-32A11B093E7B"
+        "5BEE62BD-F04C-49E8-A65A-32A11B093E7B",
+        "430EE745-314D-48CE-A20B-ED2C4D79BC92"
       ],
       "refViews": [],
       "refDiagrams": [],

db/文明创办.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.2.0",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-1-2 20:52:56",
+  "updatedTime": "2023-1-2 22:36:59",
   "dbConns": [],
   "profile": {
     "default": {
@@ -7985,9 +7985,38 @@
       "id": "430EE745-314D-48CE-A20B-ED2C4D79BC92",
       "env": {
         "base": {
-          "nameSpace": "",
-          "codeRoot": ""
-        }
+          "nameSpace": "com.example.civilizedcity",
+          "codeRoot": "TaMessage"
+        },
+        "template": {
+          "JavaMybatisPlus": {
+            "Controller": {
+              "suffix": "controller/{{=it.codeRoot}}Controller.java",
+              "enable": true
+            },
+            "Service": {
+              "suffix": "service/{{=it.codeRoot}}Service.java",
+              "enable": true
+            },
+            "ServiceImpl": {
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java",
+              "enable": true
+            },
+            "Mapper": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java",
+              "enable": true
+            },
+            "Mapper.xml": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml",
+              "enable": true
+            },
+            "Entity": {
+              "suffix": "entity/{{=it.codeRoot}}.java",
+              "enable": true
+            }
+          }
+        },
+        "custom": {}
       },
       "defKey": "ta_message",
       "defName": "消息通知",
@@ -8079,6 +8108,23 @@
           "uiHint": "",
           "id": "FC7B9B05-7D57-4818-8266-F8A4D62DB212"
         },
+        {
+          "defKey": "msg_type",
+          "defName": "消息类型",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "92ACF22A-5638-4B62-9656-71D9089F7D7E"
+        },
         {
           "defKey": "title",
           "defName": "消息标题",

src/main/java/com/example/civilizedcity/controller/TaIssueApplyController.java

@@ -12,11 +12,13 @@ import java.util.List;
 
 import com.example.civilizedcity.common.StringUtils;
 import com.example.civilizedcity.entity.SysUser;
+import com.example.civilizedcity.event.MessagEvent;
 import com.example.civilizedcity.service.TaIssueService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.web.bind.annotation.*;
 import com.example.civilizedcity.entity.TaIssueApply;
 import com.example.civilizedcity.service.TaIssueApplyService;
@@ -38,6 +40,9 @@ public class TaIssueApplyController extends BaseController {
     @Autowired
     private TaIssueService taIssueService;
 
+    @Autowired
+    ApplicationEventPublisher applicationEventPublisher;
+
     /**
      * 通过ID查询单条数据
      *
@@ -153,6 +158,9 @@ public class TaIssueApplyController extends BaseController {
 //            taIssueService.updateValidateStatus(taIssueApply.getIssueId(), validateStatus);
 //        }
 
+
+        applicationEventPublisher.publishEvent(new MessagEvent(this, origin));
+
         return ResponseBean.success(origin);
     }
 

src/main/java/com/example/civilizedcity/controller/TaMessageController.java

@@ -4,8 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.civilizedcity.common.BaseController;
+import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.ResponseBean;
+
+import java.util.ArrayList;
 import java.util.List;
+
+import com.example.civilizedcity.entity.SysUser;
+import com.example.civilizedcity.service.SysUserDutyService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -14,8 +20,9 @@ import org.springframework.web.bind.annotation.*;
 import com.example.civilizedcity.entity.TaMessage;
 import com.example.civilizedcity.service.TaMessageService;
 
- /**
+/**
  * 消息通知;(ta_message)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2023-1-2
  */
@@ -23,12 +30,15 @@ import com.example.civilizedcity.service.TaMessageService;
 @RestController
 @RequestMapping("/")
 public class TaMessageController extends BaseController {
-    
+
     @Autowired
     private TaMessageService taMessageService;
-    
-    /** 
-     * 通过ID查询单条数据 
+
+    @Autowired
+    private SysUserDutyService sysUserDutyService;
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param msgId 主键
      * @return 实例对象
@@ -38,28 +48,53 @@ public class TaMessageController extends BaseController {
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
         return ResponseBean.success(taMessageService.getById(id));
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping("/taMessage")
-    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
-        
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) throws Exception {
+
+        SysUser sysUser = currentUser();
+        List<String> dutyList = sysUserDutyService.getListByUser(sysUser.getUserId());
+        if (null == dutyList) {
+            dutyList = new ArrayList<>();
+        }
+
         IPage<TaMessage> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<TaMessage> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
+        QueryWrapper<TaMessage> queryWrapper = new QueryWrapper<>();
+
+        // 如果是管理员
+        if (dutyList.contains(Constants.DUTY_MANAGER)) {
+            // 可以查询当前单位以及给自己的
+            queryWrapper.nested(q -> q.eq("org_id", Constants.ROOT_ORG).or().eq("receive_user", sysUser.getUserId()));
+        } else if (dutyList.contains(Constants.DUTY_INSPECTOR)) {
+            // 督察员只能查询给自己的
+            queryWrapper.eq("receive_user", sysUser.getUserId());
+        } else if (dutyList.contains(Constants.DUTY_ORG_USER)) {
+            // 交办单位的，可以查询给本单位的
+            queryWrapper.eq("org_id", sysUser.getOrgId());
+            queryWrapper.ne("msg_type", "apply-verify");
+        } else if (dutyList.contains(Constants.DUTY_ORG_MANAGER)) {
+            // 交办单位管理员, 只能查询 问题单提审 类型的消息
+            queryWrapper.eq("org_id", sysUser.getOrgId());
+            queryWrapper.eq("msg_type", "apply-verify");
+        }
+
+        queryWrapper.eq("status", Constants.STATUS_NORMAL);
+        queryWrapper.orderByDesc("create_date");
         IPage<TaMessage> result = taMessageService.page(pg);
-        
+
         return ResponseBean.success(result);
     }
-    
-    /** 
+
+    /**
      * 新增数据
      *
      * @param taMessage 实例对象
@@ -71,8 +106,8 @@ public class TaMessageController extends BaseController {
         taMessageService.save(taMessage);
         return ResponseBean.success(taMessage);
     }
-    
-    /** 
+
+    /**
      * 更新数据
      *
      * @param taMessage 实例对象
@@ -81,12 +116,12 @@ public class TaMessageController extends BaseController {
     @ApiOperation("更新数据")
     @PutMapping("/taMessage/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaMessage taMessage,
-                            @ApiParam("对象ID") @PathVariable Integer id ) throws Exception {
+                             @ApiParam("对象ID") @PathVariable Integer id) throws Exception {
         taMessageService.updateById(taMessage);
         return ResponseBean.success(taMessage);
     }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
      * @param msgId 主键
@@ -94,7 +129,7 @@ public class TaMessageController extends BaseController {
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/taMessage/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id){
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id) {
         taMessageService.removeLogicById(id);
         return ResponseBean.success("success");
     }

src/main/java/com/example/civilizedcity/entity/TaMessage.java

@@ -24,8 +24,11 @@ import lombok.experimental.Accessors;
 public class TaMessage implements Serializable,Cloneable{
     /** ID */
     @ApiModelProperty(name = "ID",notes = "")
-    @TableId(value = "msg_id", type = IdType.ASSIGN_UUID)
+    @TableId(value = "msg_id", type = IdType.AUTO)
     private Integer msgId ;
+     /** 消息类型 */
+     @ApiModelProperty(name = "消息类型",notes = "")
+     private String msgType ;
     /** 消息标题 */
     @ApiModelProperty(name = "消息标题",notes = "")
     private String title ;

src/main/java/com/example/civilizedcity/service/impl/TaMessageServiceImpl.java

@@ -32,6 +32,7 @@ public class TaMessageServiceImpl extends BaseServiceImpl<TaMessageMapper, TaMes
 
         // 问题单驳回
         if (Constants.PROCESS_START.equals(taIssue.getProcessNode()) && Constants.PROCESS_STATUS_REJECT.equals(taIssue.getProcessStatus())) {
+            taMessage.setMsgType("issue-reject");
             taMessage.setTitle("问题单被驳回");
             taMessage.setTargetType(Constants.MESSAGE_TARGET_ISSUE);
             taMessage.setTargetId(taIssue.getIssueId().toString());
@@ -65,6 +66,8 @@ public class TaMessageServiceImpl extends BaseServiceImpl<TaMessageMapper, TaMes
         taMessage.setCreateDate(LocalDateTime.now());
 
         if (isApply) {
+            taMessage.setMsgType("apply-" + taIssueApply.getApplyType());
+
             switch (taIssueApply.getApplyType()) {
                 case Constants.APPLY_DELAY:
                     taMessage.setTitle("延期申请");
@@ -97,6 +100,7 @@ public class TaMessageServiceImpl extends BaseServiceImpl<TaMessageMapper, TaMes
                     break;
             }
         } else {
+            taMessage.setMsgType("verify-" + taIssueApply.getApplyType());
             taMessage.setContent("审核结果: " + (Constants.APPLY_STATUS_PASS.equals(taIssueApply.getVerifyStatus()) ? "通过" : "不通过"));
             taMessage.setReceiveUser(null);
             taMessage.setOrgId(taIssueApply.getOrgId());

src/main/resources/mapper/TaIssueApplyMapper.xml

@@ -26,6 +26,7 @@
             AND s.source_type != 'feedback'
         </if>
         ORDER BY
+            IFNULL(t.verify_status, -1) ASC,
             t.create_date DESC
     </select>
 </mapper>