Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

project_data/sql/0.0.2/soc/soc.sql

@@ -1000,6 +1000,7 @@ delete from sys_dict_type where dict_type='drill_task_rec_status';
 delete from sys_dict_data where dict_type='drill_task_rec_status';
 delete from sys_dict_data where dict_type='science_protection';
 delete  from sys_dict_data where  dict_label in ('淋浴式灭火器','防毒面具');
+delete  from sys_dict_data where dict_type= 'sys_device_type';
 INSERT INTO sys_dict_type (dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark) VALUES ( '演练任务推荐状态', 'drill_task_rec_status', '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 (0, '正常案例', '0', 'drill_task_rec_status', null, 'default', 'N', '0', '超级管理员', now(), '超级管理员', now(), 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 (0, '行社优秀案例', '1', 'drill_task_rec_status', null, 'default', 'N', '0', '超级管理员', now(), '超级管理员', now(), null);
@@ -1017,8 +1018,20 @@ INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_cla
 VALUES (2, '报警主机', '1', 'science_protection', 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 (3, '摄像机', '2', 'science_protection', 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 (1, '硬盘录像机', '0', 'sys_device_type', 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, '报警主机', '1', 'sys_device_type', 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 (3, '摄像机', '2', 'sys_device_type', 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 (4, '灭火器', '3', 'sys_device_type', 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 (5, '消防栓', '4', 'sys_device_type', 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 (6, '淋浴式灭火器', '5', 'sys_device_type', 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 (7, '防毒面具', '6', 'sys_device_type', null, 'default', 'N', '0', '超级管理员', now(), '', null, null);
 -- 新增演练任务状态字典
 delete from sys_dict_type where dict_type='drill_task_status';
 delete from sys_dict_data where dict_type='drill_task_status';
@@ -1434,7 +1447,14 @@ VALUES ( '发送状态', 'send_status', '0', '超级管理员', '2023-09-13 18:1
 INSERT INTO `sys_dict_type` (`dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
 VALUES ( '评价周期', 'evaluate_cycle', '0', '超级管理员', '2023-09-13 18:14:59', '', NULL, NULL);
 
-DELETE from `sys_dict_data` WHERE dict_type in ('post_no_pass','question_confirm_status','question_reform_status','send_status','message_type','send_time_type');
+DELETE from `sys_dict_data` WHERE dict_type in ('post_no_pass','question_confirm_status','question_reform_status','send_status','message_type','send_time_type','evaluate_cycle');
+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 ( 0, '每月', '0', 'evaluate_cycle', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:15:44', '', 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 ( 1, '每季度', '1', 'evaluate_cycle', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:15:44', '', 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, '每年', '2', 'evaluate_cycle', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:15:44', '', 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 ( 0, '待确认', '0', 'question_confirm_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:15:44', '', 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 (1, '提出异议', '1', 'question_confirm_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:16:01', '', 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, '已确认', '2', 'question_confirm_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:16:18', '', NULL, NULL);

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysDevice.java

@@ -73,7 +73,7 @@ public class SysDevice extends BaseEntity {
     /**
      * 验收日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty(value = "有效期至")
     private Date checkTime;
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/message/vo/CoreAnnouncementNotificationPageVo.java

@@ -23,56 +23,77 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 
-@ApiModel(value = "CoreAnnouncementNotification对象" , description = "公告通知")
-public class CoreAnnouncementNotificationPageVo
-        {
-private static final long serialVersionUID=1L;
+@ApiModel(value = "CoreAnnouncementNotification对象", description = "公告通知")
+public class CoreAnnouncementNotificationPageVo {
+    private static final long serialVersionUID = 1L;
 
-    /**  */
+    /**
+     *
+     */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
-    /** 机构 */
+    /**
+     * 机构
+     */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
-    /** 创建机构 */
-            @ApiModelProperty(value = "创建机构")
+    /**
+     * 创建机构
+     */
+    @ApiModelProperty(value = "创建机构")
     private String orgName;
 
-    /** 机构 */
+    /**
+     * 机构
+     */
     private String orgPath;
 
-    /** 标题 */
+    /**
+     * 标题
+     */
     private String title;
 
-    /** 内容 */
-            @ApiModelProperty(value = "内容")
+    /**
+     * 内容
+     */
+    @ApiModelProperty(value = "内容")
     private String content;
 
-    /** 消息类型 */
-            @ApiModelProperty(value = "消息类型")
+    /**
+     * 消息类型
+     */
+    @ApiModelProperty(value = "消息类型")
     private String messagType;
-            /**
-             * 机构类型
-             */
-      private String  tagOrgType;
-    /** 目标机构 */
+    /**
+     * 机构类型
+     */
+    private String tagOrgType;
+    /**
+     * 目标机构
+     */
     private List<Long> tagOrgIds;
 
-    /** 目标角色 */
+    /**
+     * 目标角色
+     */
     private List<Long> tagRoleIds;
 
-    /** 发布时间 */
-            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-            @ApiModelProperty(value = "发布时间")
+    /**
+     * 发布时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "发布时间")
     private Date publishTime;
 
-    /** 状态 */
-            @ApiModelProperty(value = "状态")
+    /**
+     * 状态
+     */
+    @ApiModelProperty(value = "状态")
     private String messagStatus;
 
-            @ApiModelProperty(value = "附件")
-            private List<String> fileList;
-
-        }
+    @ApiModelProperty(value = "附件")
+    private List<String> fileList;
+    private String createBy;
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/message/service/impl/CoreAnnouncementNotificationServiceImpl.java

@@ -117,11 +117,13 @@ public class CoreAnnouncementNotificationServiceImpl extends ServiceImpl<CoreAnn
         }else{
             page = new Page<>();
         }
-        page = coreAnnouncementNotificationMapper.selectAppPage(page, request);
-        if(page!=null&&CollectionUtil.isNotEmpty(page.getRecords())){
-            page = this.buildNewNotificationAppPageVo(page,request);
-        }
+        if(CollectionUtil.isNotEmpty(request.getTagRoleIds())){
+            page = coreAnnouncementNotificationMapper.selectAppPage(page, request);
+            if(page!=null&&CollectionUtil.isNotEmpty(page.getRecords())){
+                page = this.buildNewNotificationAppPageVo(page,request);
+            }
 
+        }
         //抓换为TableDataInfo适配前端
         return TableDataInfo.build(page);
     }

soc-modules/soc-modules-core/src/main/resources/mapper/message/CoreAnnouncementNotificationMapper.xml

@@ -85,10 +85,10 @@
         select T.*,T.file_list as strFileList from (select a.* from core_announcement_notification a
                          left join core_announcement_notification_to_role b on a.id = b.announcement_notification_id
                          left join core_announcement_notification_to_org c on a.id = c.announcement_notification_id
-                         where  c.org_id = #{request.orgId} and (b.role_id in
+                         where a.messag_status = 1 and c.org_id = #{request.orgId} and (a.messag_type = 0 or (b.role_id in
                             <foreach collection="request.tagRoleIds" item="item" open="(" close=")" separator=",">
                                 #{item}
-                            </foreach> and a.messag_type=1) or a.messag_type = 0
+                            </foreach> and a.messag_type=1))
                          GROUP BY a.id) T
     </select>
     <select id="selectNotificationToUsers"

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysPhysicalDefenseConstruction.java

@@ -54,7 +54,7 @@ public class SysPhysicalDefenseConstruction extends BaseEntity {
      * 是否证书佐证
      */
     @ApiModelProperty(value = "是否证书佐证")
-    private Long certificateEvidence;
+    private Integer certificateEvidence;
 
 
     /**