Merge branch 'dev' of http://146.56.199.25:3000/zhuibobo/EnforcementCode-2.0 into dev

script/sql/zfjd-refactoring-v1/其他/gh/gh0729.sql

@@ -0,0 +1,21 @@
+DROP TABLE IF EXISTS siq_msg_info;
+CREATE TABLE `siq_msg_info` (
+    `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键自增ID',
+    `task_id` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '任务ID',
+    `source_id` varchar(64) COLLATE utf8mb4_general_ci NOT NULL COMMENT '来源ID',
+    `status` tinyint NOT NULL DEFAULT '0' COMMENT '发送给深I企状态：0-待发送；1-发送成功；2-正在发送；3-发送异常；4-发送失败',
+    `send_status` tinyint DEFAULT '0' COMMENT '站内信发送状态：0-待发送；1-发送成功；2-正在发送；3-发送异常；4-发送失败；5-任务取消',
+    `send_finished_time` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '发送完成时间（时间戳，毫秒）',
+    `error_msg` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '错误信息',
+    `create_by` varchar(64) COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '创建者',
+    `create_dept` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人部门',
+    `update_by` varchar(64) COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '更新者',
+    `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    `is_delete` tinyint NOT NULL DEFAULT '0' COMMENT '是否删除 0=否 1=是',
+    `remark` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '备注',
+    PRIMARY KEY (`id`),
+    KEY `idx_task_id` (`task_id`),
+    KEY `idx_source_id` (`source_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2082371265445888003 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='深I企消息信息表';
+

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCaseInfoController.java

@@ -2,6 +2,7 @@ package com.zdxt.enforcementcode.controller.app.enforcement;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import com.zdxt.enforcementcode.domain.SxtXzqzjbxx173774;
+import com.zdxt.enforcementcode.domain.Xzjcjbxx025711;
 import com.zdxt.enforcementcode.domain.bo.*;
 import com.zdxt.enforcementcode.domain.vo.*;
 import com.zdxt.enforcementcode.service.*;
@@ -33,6 +34,16 @@ public class AppEnfCaseInfoController  {
     @Autowired
     private ISxtXzcfajjbxx026705Service sxtXzcfajjbxx026705Service;
 
+    /**
+     * 查询【历史检查信息】列表
+     */
+    @GetMapping("/oldQueryXzjcList")
+    public TableDataInfo<Xzjcjbxx025711> oldQueryXzjcList(Xzjcjbxx025711 xzjcjboxx,PageQuery pageQuery)
+    {
+        TableDataInfo<Xzjcjbxx025711>  list = sxtJcdzb107522Service.queryByEnterpriseNumber(xzjcjboxx,pageQuery);
+        return list;
+    }
+
     /**
      * 查询【历史检查信息】列表
      */

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/Xzjcjbxx025711.java

@@ -284,5 +284,8 @@ public class Xzjcjbxx025711 extends BaseEntity {
      */
     private Long updatestatus;
 
-
+    /**
+     *
+     */
+    private String enterpriseNumber;
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/SxtJcdzb107522Mapper.java

@@ -2,6 +2,7 @@ package com.zdxt.enforcementcode.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zdxt.enforcementcode.domain.SxtJcdzb107522;
+import com.zdxt.enforcementcode.domain.Xzjcjbxx025711;
 import com.zdxt.enforcementcode.domain.bo.SxtJcdzb107522Bo;
 import com.zdxt.enforcementcode.domain.bo.Xzjcjbxx025711Bo;
 import com.zdxt.enforcementcode.domain.vo.SxtJcdzb107522Vo;
@@ -20,4 +21,11 @@ import java.util.List;
 public interface SxtJcdzb107522Mapper extends BaseMapperPlus<SxtJcdzb107522, SxtJcdzb107522Vo> {
 
     List<SxtJcdzb107522Vo> selectXzjcHistoryList(@Param("bo") SxtJcdzb107522Bo bo, @Param("page") Page<SxtJcdzb107522Vo> page);
+
+    /**
+     * 一期行政执法检查信息
+     * @param xzjcjboxx
+     * @return
+     */
+    List<Xzjcjbxx025711> queryByEnterpriseNumber(@Param("param") Xzjcjbxx025711 xzjcjboxx,@Param("page") Page<Xzjcjbxx025711> page);
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISxtJcdzb107522Service.java

@@ -1,5 +1,7 @@
 package com.zdxt.enforcementcode.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zdxt.enforcementcode.domain.Xzjcjbxx025711;
 import com.zdxt.enforcementcode.domain.bo.Xzjcjbxx025711Bo;
 import com.zdxt.enforcementcode.domain.vo.SxtJcdzb107522Vo;
 import com.zdxt.enforcementcode.domain.bo.SxtJcdzb107522Bo;
@@ -69,4 +71,13 @@ public interface ISxtJcdzb107522Service {
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
     TableDataInfo<SxtJcdzb107522Vo> selectXzjcHistoryList(SxtJcdzb107522Bo bo, PageQuery pageQuery);
+
+
+    /**
+     * 一期旧的
+     * @param xzjcjboxx
+     * @param pageQuery
+     * @return
+     */
+    TableDataInfo<Xzjcjbxx025711>  queryByEnterpriseNumber(Xzjcjbxx025711 xzjcjboxx,PageQuery pageQuery);
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SxtJcdzb107522ServiceImpl.java

@@ -1,5 +1,6 @@
 package com.zdxt.enforcementcode.service.impl;
 
+import com.zdxt.enforcementcode.domain.Xzjcjbxx025711;
 import com.zdxt.enforcementcode.domain.bo.Xzjcjbxx025711Bo;
 import com.zdxt.enforcementcode.domain.vo.Xzjcjbxx025711Vo;
 import org.dromara.common.core.utils.MapstructUtils;
@@ -184,4 +185,18 @@ public class SxtJcdzb107522ServiceImpl implements ISxtJcdzb107522Service {
         List<SxtJcdzb107522Vo> list = baseMapper.selectXzjcHistoryList(bo, page);
         return TableDataInfo.build(list);
     }
+
+    /**
+     * 一期
+     * @param xzjcjboxx
+     * @return
+     */
+    @Override
+    public  TableDataInfo<Xzjcjbxx025711>  queryByEnterpriseNumber(Xzjcjbxx025711 xzjcjboxx,PageQuery pageQuery) {
+        Page<Xzjcjbxx025711> page = pageQuery.build();
+        List<Xzjcjbxx025711> list =  baseMapper.queryByEnterpriseNumber(xzjcjboxx,page);
+        return TableDataInfo.build(list);
+    }
+
+
 }

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseInformationMapper.xml

@@ -79,7 +79,7 @@
                         qr_code_url,
                         generate_time
                         FROM qr_code_generate_history
-                    WHERE `status` = 0 ORDER BY generate_time DESC LIMIT 1 ) t
+                    WHERE `status` = 0 ORDER BY generate_time DESC) t
          GROUP BY
             t.enterprise_number,t.qr_code_url,t.generate_time
             ) gh ON ei.enterprise_number = gh.enterprise_number

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/SxtJcdzb107522Mapper.xml

@@ -18,4 +18,22 @@
         a.c601034 =
         #{bo.c601034} order by  b.C601005 desc
     </select>
+
+
+    <select id="queryByEnterpriseNumber" parameterType="com.zdxt.enforcementcode.domain.bo.SxtJcdzb107522Bo" resultType="com.zdxt.enforcementcode.domain.Xzjcjbxx025711">
+        select
+            b.C601002,
+            b.C601005,
+            b.C601015,
+            b.C601011
+        from
+            XZJCDSRXX016987 a
+                left join xzjcjbxx025711 b on
+                b.c601000 = a.c601000
+        where
+            a.C601034 = #{param.enterpriseNumber}
+        order by
+            b.C601005 desc
+    </select>
+
 </mapper>

zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml

@@ -4,10 +4,9 @@ zdxt:
     upload-path: D:\zfjdm\uploadPath
 #    upload-path: /usr/local/uploadPath
 #    upload-path: /Users/vincent/uploadPath
-    url-prefix: /profile
-    qr_code_url: /usr/local/uploads/zfjd_logo.png
-  demo_enabled: false
-
+#    url-prefix: /profile
+ #   qr_code_url: /usr/local/uploads/zfjd_logo.png
+ # demo_enabled: false
 --- # 监控中心配置
 spring.boot.admin.client:
   # 增加客户端开关
@@ -110,14 +109,14 @@ spring.data:
   redis:
     # 地址
 #    host: 139.186.148.21
-    host: 127.0.0.1
+    host: 172.16.20.72
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 0
     # redis 密码必须配置
 #    password: zdxt@123
-    # password:
+    password:
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl
@@ -355,6 +354,8 @@ xss:
   excludeUrls:
     - /web/enforcementcode/educationServices/add
     - /web/enforcementcode/educationServices/edit
+    - /web/supervision/carouselBanner/add
+    - /web/supervision/carouselBanner/edit
 
 --- # 业务数据双向同步配置
 business-data-sync: