Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/db/base_modules.sql

@@ -288,41 +288,43 @@ CREATE TABLE mortals_sys_window_matter
 -- 工作人员表
 -- ----------------------------
 DROP TABLE IF EXISTS `mortals_sys_workman`;
-CREATE TABLE `mortals_sys_workman`
-(
-    `id`               bigint(20) NOT NULL AUTO_INCREMENT COMMENT '序号，主键，自增长',
-    `loginName`        varchar(64)  DEFAULT NULL COMMENT '登录用户名',
-    `loginPwd`         varchar(255) DEFAULT NULL COMMENT '密码',
-    `deptId`           bigint(20) DEFAULT NULL COMMENT '部门id号',
-    `deptName`         varchar(64)  DEFAULT NULL COMMENT '部门名称',
-    `windowId`         bigint(20) DEFAULT NULL COMMENT '窗口id号',
-    `windowName`       varchar(64)  DEFAULT NULL COMMENT '窗口名称',
-    `siteId`           bigint(20) DEFAULT NULL COMMENT '站点ID',
-    `siteName`         varchar(255) DEFAULT NULL COMMENT '站点名称',
-    `name`             varchar(64)  DEFAULT NULL COMMENT '姓名',
-    `number`           varchar(64)  DEFAULT NULL COMMENT '工号',
-    `userpost`         varchar(64)  DEFAULT NULL COMMENT '职务',
-    `posttitle`        varchar(64)  DEFAULT NULL COMMENT '职称',
-    `politicalstatus`  tinyint(2) DEFAULT '0' COMMENT '政治面貌 （0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它)',
-    `dangyuan`         tinyint(2) DEFAULT '0' COMMENT '党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)',
-    `dangyuanext`      varchar(64)  DEFAULT NULL COMMENT '党员扩展',
-    `phone`            varchar(64)  DEFAULT NULL COMMENT '电话',
-    `mobile`           varchar(64)  DEFAULT NULL COMMENT '手机',
-    `starlevel`        tinyint(2) DEFAULT NULL COMMENT '星级',
-    `summary`          varchar(255) DEFAULT NULL COMMENT '个人简介',
-    `photoPath`        varchar(255) DEFAULT NULL COMMENT '照片',
-    `duty`             mediumtext COMMENT '岗位职责',
-    `promise`          mediumtext COMMENT '服务承诺',
-    `business`         mediumtext COMMENT '办理事项',
-    `online`           tinyint(2) DEFAULT '1' COMMENT '是否在线（0.离线，1.在线，2.暂离,3.点击暂离,4.回归,5.登陆）',
-    `modelIds`         varchar(256) DEFAULT '' COMMENT '配置站点模块，逗号分隔',
-    `createTime`       datetime     DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间',
-    `createUserId`     bigint(20) DEFAULT NULL COMMENT '创建用户',
-    `updateTime`       datetime     DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
-    `lastLoginTime`    datetime     DEFAULT NULL COMMENT '最后一次登录时间',
-    `lastLoginAddress` varchar(21)  DEFAULT NULL COMMENT '最后一次登录地址',
-    PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COMMENT='工作人员表';
+CREATE TABLE mortals_sys_workman(
+                                    `id` bigint(20)   AUTO_INCREMENT   COMMENT '序号，主键，自增长',
+                                    `loginName` varchar(64)      COMMENT '登录用户名',
+                                    `loginPwd` varchar(255)      COMMENT '密码',
+                                    `deptId` bigint(20)      COMMENT '部门id号',
+                                    `deptName` varchar(64)      COMMENT '部门名称',
+                                    `windowId` bigint(20)      COMMENT '窗口id号',
+                                    `windowName` varchar(64)      COMMENT '窗口名称',
+                                    `siteId` bigint(20)      COMMENT '站点ID',
+                                    `siteName` varchar(255)      COMMENT '站点名称',
+                                    `name` varchar(64)      COMMENT '姓名',
+                                    `number` varchar(64)      COMMENT '工号',
+                                    `userpost` varchar(64)      COMMENT '职务',
+                                    `posttitle` varchar(64)      COMMENT '职称',
+                                    `politicalstatus` tinyint(2)    DEFAULT '0'  COMMENT '政治面貌 （0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它)',
+                                    `dangyuan` tinyint(2)    DEFAULT '0'  COMMENT '党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)',
+                                    `dangyuanext` varchar(64)      COMMENT '党员扩展',
+                                    `idCard` varchar(32)      COMMENT '身份证',
+                                    `phone` varchar(64)      COMMENT '电话',
+                                    `mobile` varchar(64)      COMMENT '手机',
+                                    `starlevel` tinyint(2)    DEFAULT '0'  COMMENT '星级',
+                                    `summary` varchar(255)      COMMENT '个人简介',
+                                    `photoPath` varchar(255)      COMMENT '照片',
+                                    `duty` mediumtext      COMMENT '岗位职责',
+                                    `promise` mediumtext      COMMENT '服务承诺',
+                                    `business` mediumtext      COMMENT '办理事项',
+                                    `online` tinyint(2)    DEFAULT '1'  COMMENT '是否在线（0.离线，1.在线，2.暂离,3.点击暂离,4.回归,5.登陆）',
+                                    `modelIds` varchar(256)      COMMENT '配置站点模块，逗号分隔',
+                                    `createTime` datetime      COMMENT '创建时间',
+                                    `createUserId` bigint(20)      COMMENT '创建用户',
+                                    `updateTime` datetime      COMMENT '修改时间',
+                                    `lastLoginTime` datetime      COMMENT '最后一次登录时间',
+                                    `lastLoginAddress` varchar(21)      COMMENT '最后一次登录地址',
+                                    PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='工作人员';
+
+
 
 -- ----------------------------
 -- 基础事项表
@@ -927,45 +929,39 @@ CREATE TABLE mortals_sys_matter_ext
 
 
 
--- ----------------------------
--- 自助终端应用表
--- ----------------------------
 -- ----------------------------
 -- 自助终端应用表
 -- ----------------------------
 DROP TABLE IF EXISTS `mortals_sys_app`;
 CREATE TABLE mortals_sys_app(
-    `id` bigint(20)   AUTO_INCREMENT  COMMENT '主键ID，主键，自增长',
-    `siteId` bigint(20)     COMMENT '站点Id',
-    `siteName` varchar(256)     COMMENT '站点名称',
-    `appCode` varchar(256)     COMMENT '应用编码',
-    `appName` varchar(256)     COMMENT '应用名称',
-    `appIconPath` varchar(256)     COMMENT '应用图标',
-    `appThemeName` varchar(256)     COMMENT '应用主题名称',
-    `type` tinyint(2)     COMMENT '类型(1.终端应用,2.移动端应用)',
-    `downDevCount` int(4)     COMMENT '下发设备次数',
-    `shelves` tinyint(2)     COMMENT '是否上架(0.下架，1.上架)',
-    `appType` tinyint(2)     COMMENT '类型(1.应用程序,2.url)',
-    `fileName` varchar(255)     COMMENT '文件名称',
-    `filePath` varchar(256)     COMMENT '文件相对路径地址',
-    `distributeFilePath` varchar(256)     COMMENT '文件部署路径地址',
-    `version` int(9)     COMMENT '当前版本',
-    `summary` varchar(2048)     COMMENT '简介',
-    `notes` varchar(512)     COMMENT '更新说明',
-    `distribute` tinyint(2)     COMMENT '是否部署(0.否，1.是)',
-    `dataUpdate` tinyint(2)     COMMENT '是否数据更新(0.否，1.是)',
-    `createTime` datetime     COMMENT '创建时间',
-    `updateUserId` bigint(20)     COMMENT '更新用户',
-    `updateTime` datetime     COMMENT '更新时间',
-    PRIMARY KEY  (`id`)
+        `id` bigint(20)   AUTO_INCREMENT   COMMENT '主键ID，主键，自增长',
+        `siteId` bigint(20)      COMMENT '站点Id',
+        `siteName` varchar(256)      COMMENT '站点名称',
+        `appCode` varchar(256)      COMMENT '应用编码',
+        `appName` varchar(256)      COMMENT '应用名称',
+        `appIconPath` varchar(256)      COMMENT '应用图标',
+        `appThemeName` varchar(256)      COMMENT '应用主题名称',
+        `type` tinyint(2)    DEFAULT '1'  COMMENT '类型(1.终端应用,2.移动端应用)',
+        `url` varchar(255)      COMMENT '链接地址',
+        `downDevCount` int(4)    DEFAULT '0'  COMMENT '下发设备次数',
+        `shelves` tinyint(2)    DEFAULT '0'  COMMENT '是否上架(0.下架，1.上架)',
+        `appType` tinyint(2)    DEFAULT '1'  COMMENT '类型(1.应用程序,2.url)',
+        `fileName` varchar(255)      COMMENT '文件名称',
+        `filePath` varchar(256)      COMMENT '文件相对路径地址',
+        `distributeFilePath` varchar(256)      COMMENT '文件部署路径地址',
+        `version` int(9)    DEFAULT '0'  COMMENT '当前版本',
+        `summary` varchar(2048)      COMMENT '简介',
+        `notes` varchar(512)      COMMENT '更新说明',
+        `distribute` tinyint(2)    DEFAULT '0'  COMMENT '是否部署(0.否，1.是)',
+        `dataUpdate` tinyint(2)    DEFAULT '0'  COMMENT '是否数据更新(0.否，1.是)',
+        `createTime` datetime      COMMENT '创建时间',
+        `updateUserId` bigint(20)      COMMENT '更新用户',
+        `updateTime` datetime      COMMENT '更新时间',
+        PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='自助终端应用';
 
 
 
-
-
-
-
 -- ----------------------------
 -- 自助终端应用数据集表
 -- ----------------------------

base-manager/doc/api.md

@@ -5286,6 +5286,7 @@ data|object|数据对象|-
   politicalstatus|Integer|政治面貌 (0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它)|-
   dangyuan|Integer|党员 (0.非党员，1.党员，2.党员示范岗，3.党员先锋岗，99.其它)|-
   dangyuanext|String|扩展信息|-
+  idCard|String|身份证
   phone|String|电话|-
   mobile|String|手机|-
   modelIds|String|模块id,逗号分隔|-
@@ -5365,6 +5366,7 @@ data|object|数据对象|-
  posttitle|String|职称|-
  politicalstatus|Integer|政治面貌 （0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它)|-
  dangyuan|Integer|党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)|-
+ idCard|String|身份证
  phone|String|电话|-
  mobile|String|手机|-
  starlevel|Integer|星级|-
@@ -5415,6 +5417,7 @@ userpost| String  | 职务                                        | 是   |-
 posttitle| String  | 职称                                        | 是   |-
 politicalstatus| Integer | 政治面貌 （0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它) | 是   |-
 dangyuan| Integer | 党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗，99.其它)     | 是   |-
+idCard|String| 身份证                                       |否
 dangyuanext| String  | 党员扩展                                      | 否   |-
 phone| String  | 电话                                        | 是   |-
 mobile| String  | 手机                                        | 是   |-
@@ -5422,7 +5425,7 @@ starlevel| Integer | 星级                                        | 是   |-
 summary| String  | 个人简介                                      | 是   |-
 photoPath| String  | 照片                                        | 是   |-
 duty| String  | 岗位职责                                      | 是   |-
-promise| String  | 服务承诺                                      | 是   |-
+promise| String  | 服务承诺               bn nb                  | 是   |-
 business| String  | 办理事项                                      | 是   |-
 modelIds| String  | 模块ids                                     | 是   |-
 online| Integer | 是否在线（0.离线，1.在线，2.暂离,3.点击暂离,4.回归,5.登陆）     | 是   |-
@@ -10507,6 +10510,95 @@ data|object|请求地址
 
 ```
 
+
+## 微官网事项
+
+### 查询微官网事项列表
+
+**请求URL:** micro/matter/list
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查询微官网事项列表
+
+**请求参数:**
+
+参数名称| 类型      |备注|必填|其它
+---|---------|--|---|---
+page| Integer |当前页|否|-
+size| Integer |每页条数|否|-1代表所有
+idList| List    |事项IDs|否|-
+
+
+**请求样例:**
+
+```
+{
+  "idList": [1,2],
+  "page": 1,
+  "size": 10
+}
+```
+
+**响应参数:**
+
+参数名称 | 参数类型    | 备注              |其它
+---|---------|-----------------|---
+code| Integer | 结果码（-1.失败，1.成功） |-
+msg| String  | 消息              |-
+data| object  | 数据对象            |-
+ data| array   | 结果集列表           |数组
+  id| Long    | 事项id            |-
+  operateSite| String  | 站点名称            |-
+  deptName| String  | 办理部门            |-
+  matterName| String  | 事项名称            |-
+  matterNo| String  | 事项编号            |-
+  windowToTheSceneNum| Int     | 窗口到现场次数            |-
+  onlineToTheSceneNum| Int  | 网办到现场次数            |-
+  promiseTimeLimitShow| Int  | 承诺办结时限            |-        |-
+
+**响应消息样例:**
+
+```
+{
+  "data": {
+    "data": [
+      {
+        "id": 2,
+        "operateSite": "",
+        "deptName": "县水利局",
+        "windowToTheSceneNum": 0,
+        "onlineToTheSceneNum": 0,
+        "promiseTimeLimitShow": ""
+      },
+      {
+        "id": 7,
+        "operateSite": "",
+        "deptName": "县文广旅局",
+        "windowToTheSceneNum": 0,
+        "onlineToTheSceneNum": 0,
+        "promiseTimeLimitShow": ""
+      }
+    ],
+    "pageInfo": {
+      "beginIndex": 0,
+      "prePageResult": 10,
+      "totalResult": 2,
+      "totalPage": 1,
+      "currPage": 1,
+      "displayPageSize": 5,
+      "hasNextPage": false,
+      "hasPrePage": false,
+      "countPage": true
+    }
+  },
+  "code": 1,
+  "msg": "查询微官网事项列表成功"
+}
+```
+
 ## 字典附录
 
 ### isBusiness

base-manager/src/main/java/com/mortals/xhx/busiz/web/MicroWebApiController.java

+package com.mortals.xhx.busiz.web;
+
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
+import com.mortals.framework.web.BaseJsonBodyController;
+import com.mortals.xhx.module.matter.model.MatterEntity;
+import com.mortals.xhx.module.matter.model.MatterQuery;
+import com.mortals.xhx.module.matter.model.vo.MatterInfo;
+import com.mortals.xhx.module.matter.service.MatterService;
+import com.mortals.xhx.module.matters.service.MattersService;
+import lombok.extern.apachecommons.CommonsLog;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.mortals.framework.ap.SysConstains.MESSAGE_INFO;
+import static com.mortals.framework.ap.SysConstains.PAGEINFO_KEY;
+
+/**
+ * 微官网接口
+ *
+ * @author:
+ * @date: 2022/12/14 9:18
+ */
+@RestController
+@CommonsLog
+@RequestMapping("micro")
+public class MicroWebApiController extends BaseJsonBodyController {
+
+    @Autowired
+    private MatterService matterService;
+
+    @PostMapping(value = "matter/list")
+    @UnAuth
+    public Rest<Object> list(@RequestBody MatterQuery query) {
+        Rest<Object> ret = new Rest<>();
+        Map<String, Object> model = new HashMap<>();
+        Context context = this.getContext();
+        String busiDesc = "查询微官网事项列表";
+        int code = VALUE_RESULT_SUCCESS;
+        try {
+            PageInfo pageInfo = this.buildPageInfo(query);
+            Result<MatterInfo> result = matterService.findMicroList(query, pageInfo, context);
+            model.put(KEY_RESULT_DATA, result.getList());
+            model.put(PAGEINFO_KEY, result.getPageInfo());
+            model.put(MESSAGE_INFO, busiDesc + "成功");
+            recordSysLog(request, busiDesc + " 【成功】");
+        } catch (Exception e) {
+            code = VALUE_RESULT_FAILURE;
+            this.doException(request, busiDesc, model, e);
+        }
+        ret.setCode(code);
+        ret.setData(model);
+        ret.setMsg(model.get(MESSAGE_INFO) == null ? "" : model.remove(MESSAGE_INFO).toString());
+        return ret;
+    }
+
+
+    protected PageInfo buildPageInfo(MatterQuery query) {
+        PageInfo pageInfo = new PageInfo();
+        if (!ObjectUtils.isEmpty(query) && !ObjectUtils.isEmpty(query.getPage())) {
+            pageInfo.setCurrPage(query.getPage());
+        }
+
+        if (!ObjectUtils.isEmpty(query) && !ObjectUtils.isEmpty(query.getSize())) {
+            pageInfo.setPrePageResult(query.getSize());
+        }
+
+        return pageInfo;
+    }
+
+}

base-manager/src/main/java/com/mortals/xhx/module/app/dao/AppDatasetDao.java

 package com.mortals.xhx.module.app.dao;
 
 import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
 import com.mortals.xhx.module.app.model.AppDatasetEntity;
+import com.mortals.xhx.module.app.model.AppDatasetQuery;
+import com.mortals.xhx.module.app.model.AppInfoFieldEntity;
+import com.mortals.xhx.module.matter.model.MatterEntity;
+
 import java.util.List;
+
 /**
-* 自助终端应用数据集Dao
-* 自助终端应用数据集 DAO接口
-*
-* @author zxfei
-* @date 2022-11-28
-*/
+ * 自助终端应用数据集Dao
+ * 自助终端应用数据集 DAO接口
+ *
+ * @author zxfei
+ * @date 2022-11-28
+ */
 
-public interface  AppDatasetDao extends ICRUDDao<AppDatasetEntity,Long>{
+public interface AppDatasetDao extends ICRUDDao<AppDatasetEntity, Long> {
 
+    String SQLID_CUSTOM_LIST = "getCustomList";
+    String SQLID_CUSTOM_COUNT = "getCustomListCount";
 
+    Result<AppInfoFieldEntity> getCustomList(AppDatasetQuery appDatasetQuery, PageInfo pageInfo);
 }

base-manager/src/main/java/com/mortals/xhx/module/app/dao/ibatis/AppDatasetDaoImpl.java

 package com.mortals.xhx.module.app.dao.ibatis;
 
 
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.ParamDto;
+import com.mortals.framework.model.Result;
+import com.mortals.xhx.module.app.model.AppDatasetQuery;
+import com.mortals.xhx.module.app.model.AppInfoFieldEntity;
+import com.mortals.xhx.module.matter.model.MatterEntity;
+import org.apache.ibatis.session.RowBounds;
 import org.springframework.stereotype.Repository;
 import com.mortals.xhx.module.app.dao.AppDatasetDao;
 import com.mortals.xhx.module.app.model.AppDatasetEntity;
+
+import java.util.ArrayList;
 import java.util.Date;
 import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
 import java.util.List;
@@ -16,6 +25,27 @@ import java.util.List;
 @Repository("appDatasetDao")
 public class AppDatasetDaoImpl extends BaseCRUDDaoMybatis<AppDatasetEntity,Long> implements AppDatasetDao {
 
+    @Override
+    public Result<AppInfoFieldEntity> getCustomList(AppDatasetQuery appDatasetQuery, PageInfo pageInfo) {
+        Result<AppInfoFieldEntity> result = new Result();
+        ParamDto paramDto = this.getQueryParam(appDatasetQuery);
+        int count = this.getCustomCount(paramDto);
+        List list = null;
+        if (count == 0) {
+            list = new ArrayList();
+        } else if (pageInfo.getPrePageResult() == -1) {
+            list = this.getSqlSession().selectList(this.getSqlId(SQLID_CUSTOM_LIST), paramDto);
+        } else {
+            RowBounds rowBounds = new RowBounds(pageInfo.getBeginIndex(), pageInfo.getPrePageResult());
+            list = this.getSqlSession().selectList(this.getSqlId(SQLID_CUSTOM_LIST), this.cpyQueryParamDto(paramDto), rowBounds);
+        }
+        pageInfo.setTotalResult(count);
+        result.setPageInfo(pageInfo);
+        result.setList(list);
+        return result;
+    }
 
-
+    public int getCustomCount(ParamDto paramDto) {
+        return this.getSqlSession().selectOne(this.getSqlId(SQLID_CUSTOM_COUNT), this.cpyQueryParamDto(paramDto));
+    }
 }

base-manager/src/main/java/com/mortals/xhx/module/app/model/AppEntity.java

@@ -11,7 +11,7 @@ import com.mortals.xhx.module.app.model.AppDatasetEntity;
  * 自助终端应用实体对象
  *
  * @author zxfei
- * @date 2022-12-01
+ * @date 2022-12-14
  */
 
 public class AppEntity extends AppVo {
@@ -45,6 +45,10 @@ public class AppEntity extends AppVo {
      * 类型(1.终端应用,2.移动端应用)
      */
     private Integer type;
+    /**
+     * 链接地址
+     */
+    private String url;
     /**
      * 下发设备次数
      */
@@ -195,6 +199,20 @@ public class AppEntity extends AppVo {
     public void setType(Integer type){
         this.type = type;
     }
+    /**
+     * 获取 链接地址
+     * @return String
+     */
+    public String getUrl(){
+        return url;
+    }
+    /**
+     * 设置 链接地址
+     * @param url
+     */
+    public void setUrl(String url){
+        this.url = url;
+    }
     /**
      * 获取 下发设备次数
      * @return Integer
@@ -385,6 +403,7 @@ public class AppEntity extends AppVo {
         sb.append(",appIconPath:").append(getAppIconPath());
         sb.append(",appThemeName:").append(getAppThemeName());
         sb.append(",type:").append(getType());
+        sb.append(",url:").append(getUrl());
         sb.append(",downDevCount:").append(getDownDevCount());
         sb.append(",shelves:").append(getShelves());
         sb.append(",appType:").append(getAppType());
@@ -415,6 +434,8 @@ public class AppEntity extends AppVo {
 
         this.type = 1;
 
+        this.url = null;
+
         this.downDevCount = 0;
 
         this.shelves = 0;
@@ -427,7 +448,7 @@ public class AppEntity extends AppVo {
 
         this.distributeFilePath = "";
 
-        this.version = 1;
+        this.version = 0;
 
         this.summary = "";
 

base-manager/src/main/java/com/mortals/xhx/module/app/model/AppQuery.java

@@ -7,7 +7,7 @@ import com.mortals.xhx.module.app.model.AppEntity;
  * 自助终端应用查询对象
  *
  * @author zxfei
- * @date 2022-12-01
+ * @date 2022-12-14
  */
 public class AppQuery extends AppEntity {
     /** 开始 主键ID，主键，自增长 */
@@ -61,6 +61,9 @@ public class AppQuery extends AppEntity {
     /** 类型(1.终端应用,2.移动端应用)列表 */
     private List <Integer> typeList;
 
+    /** 链接地址 */
+    private List<String> urlList;
+
     /** 开始 下发设备次数 */
     private Integer downDevCountStart;
 
@@ -447,6 +450,21 @@ public class AppQuery extends AppEntity {
         this.typeList = typeList;
     }
 
+    /**
+     * 获取 链接地址
+     * @return urlList
+     */
+    public List<String> getUrlList(){
+        return this.urlList;
+    }
+
+    /**
+     * 设置 链接地址
+     * @param urlList
+     */
+    public void setUrlList(List<String> urlList){
+        this.urlList = urlList;
+    }
     /**
      * 获取 开始 下发设备次数
      * @return downDevCountStart
@@ -1264,6 +1282,25 @@ public class AppQuery extends AppEntity {
         return this;
     }
 
+
+    /**
+     * 设置 链接地址
+     * @param url
+     */
+    public AppQuery url(String url){
+        setUrl(url);
+        return this;
+    }
+
+    /**
+     * 设置 链接地址
+     * @param urlList
+     */
+    public AppQuery urlList(List<String> urlList){
+        this.urlList = urlList;
+        return this;
+    }
+
     /**
      * 设置  下发设备次数
      * @param downDevCount

base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppDatasetVo.java

 package com.mortals.xhx.module.app.model.vo;
+
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.app.model.AppDatasetEntity;
+import lombok.Data;
+
 import java.util.ArrayList;
 import java.util.List;
+
 /**
-* 自助终端应用数据集视图对象
-*
-* @author zxfei
-* @date 2022-11-28
-*/
+ * 自助终端应用数据集视图对象
+ *
+ * @author zxfei
+ * @date 2022-11-28
+ */
+
+@Data
 public class AppDatasetVo extends BaseEntityLong {
+    /**
+     * 字段编码
+     */
+    private String fieldCode;
+    /**
+     * 字段名称
+     */
+    private String fieldName;
+    /**
+     * 字段值
+     */
+    private String fieldValue;
+
+    private Long appId;
+
+    private List<Long> idList;
 
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppVo.java

@@ -22,4 +22,6 @@ public class AppVo extends BaseEntityLong {
 
     private List<Long> siteIdList;
 
+    private List <Long> idList;
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/app/service/AppDatasetService.java

 package com.mortals.xhx.module.app.service;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.app.model.AppDatasetEntity;
+import com.mortals.xhx.module.app.model.AppDatasetQuery;
+import com.mortals.xhx.module.app.model.AppInfoFieldEntity;
+import com.mortals.xhx.module.matter.model.MatterEntity;
+
 /**
 * AppDatasetService
 *
@@ -11,4 +19,7 @@ import com.mortals.xhx.module.app.model.AppDatasetEntity;
 */
 public interface AppDatasetService extends ICRUDService<AppDatasetEntity,Long>{
 
+
+    Result<AppInfoFieldEntity> findCustomList(AppDatasetQuery appDatasetQuery, PageInfo pageInfo, Context context) throws AppException;
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppDatasetServiceImpl.java

@@ -2,6 +2,8 @@ package com.mortals.xhx.module.app.service.impl;
 
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.key.Constant;
 import com.mortals.xhx.module.app.model.*;
@@ -34,11 +36,6 @@ public class AppDatasetServiceImpl extends AbstractCRUDServiceImpl<AppDatasetDao
 
     @Autowired
     private AppInfoFieldService appInfoFieldService;
-    @Autowired
-    private AppService appService;
-    @Autowired
-    private AppVersionService appVersionService;
-
 
     @Override
     protected void saveAfter(AppDatasetEntity entity, Context context) throws AppException {
@@ -52,9 +49,6 @@ public class AppDatasetServiceImpl extends AbstractCRUDServiceImpl<AppDatasetDao
             appInfoFieldService.save(entity.getAppInfoFieldList());
         }
 
-        //更新版本号
-/*        AppEntity appEntity = appService.get(entity.getAppId(), context);
-        saveOrUpdateAppVersion(appEntity, context);*/
         super.saveAfter(entity, context);
     }
 
@@ -87,25 +81,8 @@ public class AppDatasetServiceImpl extends AbstractCRUDServiceImpl<AppDatasetDao
         super.removeAfter(ids, context, result);
     }
 
-  /*  private void saveOrUpdateAppVersion(AppEntity appEntity, Context context) {
-        if (!ObjectUtils.isEmpty(appEntity)) {
-            String version = appEntity.getVersion();
-            String versionNum = StrUtil.subAfter(version, Constant.VERSION_PREFIX, false);
-            String newVersionNum = NumberUtil.add(versionNum, "0.1").setScale(1).toString();
-            AppVersionEntity appVersionEntity = new AppVersionEntity();
-            appVersionEntity.initAttrValue();
-            AppVersionEntity versionEntity = new AppVersionEntity();
-            versionEntity.initAttrValue();
-            versionEntity.setAppId(appEntity.getId());
-            versionEntity.setVersion(Constant.VERSION_PREFIX + newVersionNum);
-            versionEntity.setNotes("应用数据更新！");
-            versionEntity.setFileName(appEntity.getFileName());
-            versionEntity.setDistributeFilePath(appVersionEntity.getDistributeFilePath());
-            versionEntity.setCreateTime(new Date());
-            versionEntity.setCreateUserId(this.getContextUserId(context));
-            appVersionService.save(versionEntity, context);
-            appEntity.setVersion(versionEntity.getVersion());
-            appService.update(appEntity, context);
-        }
-    }*/
+    @Override
+    public Result<AppInfoFieldEntity> findCustomList(AppDatasetQuery appDatasetQuery, PageInfo pageInfo, Context context) throws AppException {
+        return this.dao.getCustomList(appDatasetQuery, pageInfo);
+    }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java

@@ -32,10 +32,7 @@ import com.mortals.xhx.module.app.dao.AppDao;
 import org.springframework.util.ObjectUtils;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -64,6 +61,23 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
 
     @Override
     protected void findAfter(AppEntity params, PageInfo pageInfo, Context context, List<AppEntity> list) throws AppException {
+        //排序
+        if(!ObjectUtils.isEmpty(params.getIdList())){
+            //根据idList进行排序
+            for (int i = 0; i < params.getIdList().size(); i++) {
+                Long id = params.getIdList().get(i);
+                for (int j = 0; j < list.size(); j++) {
+                    if(id.equals(list.get(j).getId())){
+                        //判断位置是否一直
+                        if(i!=j){
+                            //交换
+                            Collections.swap(list,i,j);
+                        }
+                    }
+                }
+            }
+        }
+
         //统计站点
         list.forEach(item -> {
             List<AppEntity> appEntityList = this.find(new AppQuery().appCode(item.getAppCode()), context);
@@ -172,25 +186,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
                         if (!ObjectUtils.isEmpty(appInfoTempleteFieldCloneList)) {
                             appInfoTempleteFieldService.save(appInfoTempleteFieldCloneList, context);
                         }
-
                     }
-                    //克隆版本历史
-/*                    List<AppVersionEntity> appVersionEntities = appVersionService.find(new AppVersionQuery().appId(appEntity.getId()));
-                    if (!ObjectUtils.isEmpty(appVersionEntities)) {
-                        List<AppVersionEntity> appVersionCloneList = new ArrayList<>();
-                        for (AppVersionEntity appVersionEntity : appVersionEntities) {
-                            AppVersionEntity appVersionClone = new AppVersionEntity();
-                            appVersionClone.initAttrValue();
-                            BeanUtils.copyProperties(appVersionEntity, appVersionClone, BeanUtil.getNullPropertyNames(appVersionEntity));
-                           appVersionClone.setAppId(appClone.getId());
-                            appVersionCloneList.add(appVersionClone);
-                        }
-
-                        if (!ObjectUtils.isEmpty(appVersionCloneList)) {
-                            appVersionService.save(appVersionCloneList, context);
-                        }
-                    }*/
-
                 }
             }
         }
@@ -298,8 +294,6 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
 
     @Override
     protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
-        //级联删除 appids 相关数据
-
         //删除模板属性
         List<AppInfoTempleteFieldEntity> appInfoTempleteFieldDeleteList = appInfoTempleteFieldService.find(new AppInfoTempleteFieldQuery().appIdList(Arrays.asList(ids)));
         if (!ObjectUtils.isEmpty(appInfoTempleteFieldDeleteList)) {
@@ -324,69 +318,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
         super.removeAfter(ids, context, result);
     }
 
-
-
-    /*    @Override
-    public int removeList(List<AppEntity> list, Context context) throws AppException {
-        return super.removeList(list, context);
-    }*/
-
-
     public static void main(String[] args) {
-        AppEntity appEntity = new AppEntity();
-        appEntity.initAttrValue();
-
-        ArrayList<AppDatasetEntity> appDatasetEntities = new ArrayList<>();
-
-        AppDatasetEntity appDatasetEntity = new AppDatasetEntity();
-        appDatasetEntity.setAppId(0L);
-
-        appDatasetEntity.setId(1L);
-        appDatasetEntity.setCreateTime(new Date());
-        appDatasetEntity.setCreateUser("");
-        appDatasetEntity.setCreateUserName("");
-
-        appDatasetEntity.setGroupList(Lists.newArrayList());
-        appDatasetEntity.setCreateUserId(0L);
-        appDatasetEntity.setCreateUserDeptId(0L);
-        appDatasetEntity.setCreateUserDeptName("");
-
-        AppInfoFieldEntity appInfoFieldEntity = new AppInfoFieldEntity();
-        appInfoFieldEntity.setDatasetId(0L);
-        appInfoFieldEntity.setFieldCode("12313");
-        appInfoFieldEntity.setFieldName("1313");
-        appInfoFieldEntity.setFieldType("1");
-        appInfoFieldEntity.setDataType("1");
-        appInfoFieldEntity.setFieldValue("");
-        appInfoFieldEntity.setFieldLen(0);
-        appInfoFieldEntity.setFieldNull(0);
-        appInfoFieldEntity.setIsList(0);
-        appInfoFieldEntity.setFieldOrderNo(1);
-        appInfoFieldEntity.setRemark("");
-        appInfoFieldEntity.setId(0L);
-        appInfoFieldEntity.setColPickMode(0);
-        appInfoFieldEntity.setCreateTime(new Date());
-        appInfoFieldEntity.setCreateUser("");
-        appInfoFieldEntity.setCreateUserName("");
-        appInfoFieldEntity.setUpdateTime(new Date());
-        appInfoFieldEntity.setUpdateUser("");
-        appInfoFieldEntity.setUpdateUserName("");
-
-        ArrayList<AppInfoFieldEntity> appInfoFieldEntities = new ArrayList<>();
-        appInfoFieldEntities.add(appInfoFieldEntity);
-
-        appDatasetEntity.setAppInfoFieldList(appInfoFieldEntities);
-        appDatasetEntities.add(appDatasetEntity);
-
-        appEntity.setAppDatasetList(appDatasetEntities);
-        AppEntity appClone = new AppEntity();
-
-        BeanUtils.copyProperties(appEntity, appClone, BeanUtil.getNullPropertyNames(appEntity));
-        System.out.println(JSON.toJSONString(appClone));
-
-
-        System.out.println(NumberUtil.add("1.0", "0.1").setScale(1).toString());
-
-
+        
     }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppVersionServiceImpl.java

@@ -86,9 +86,7 @@ public class AppVersionServiceImpl extends AbstractCRUDServiceImpl<AppVersionDao
 
         AppVersionEntity model = new AppVersionEntity();
         model.setUsed(YesNoEnum.NO.getValue());
-
         AppVersionQuery condition = new AppVersionQuery().appId(appVersionEntity.getAppId());
-
         this.getDao().update(model,condition);
         this.update(appVersionEntity, context);
 

base-manager/src/main/java/com/mortals/xhx/module/app/web/AppController.java

@@ -56,6 +56,9 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
         super.init(model, context);
     }
 
+
+
+
     @Override
     protected int infoAfter(Long id, Map<String, Object> model, AppEntity entity, Context context) throws AppException {
         List<AppEntity> appEntityList = this.service.find(new AppQuery().appCode(entity.getAppCode()), context);
@@ -64,6 +67,15 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
         return super.infoAfter(id, model, entity, context);
     }
 
+    @Override
+    protected int doListAfter(AppEntity query, Map<String, Object> model, Context context) throws AppException {
+      //model.get("result")
+
+
+
+        return super.doListAfter(query, model, context);
+    }
+
     /**
      * app应用部署
      */

base-manager/src/main/java/com/mortals/xhx/module/app/web/AppDatasetController.java

 package com.mortals.xhx.module.app.web;
+
+import cn.hutool.core.util.StrUtil;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.app.model.AppDatasetQuery;
+import com.mortals.xhx.module.app.model.AppInfoFieldEntity;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
 import com.mortals.framework.model.Context;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.module.app.model.AppDatasetEntity;
 import com.mortals.xhx.module.app.service.AppDatasetService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+
 import com.alibaba.fastjson.JSONObject;
+
 import java.util.Arrays;
+
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import static com.mortals.framework.ap.SysConstains.*;
+
 /**
-*
-* 自助终端应用数据集
-*
-* @author zxfei
-* @date 2022-11-28
-*/
+ * 自助终端应用数据集
+ *
+ * @author zxfei
+ * @date 2022-11-28
+ */
 @RestController
 @RequestMapping("app/dataset")
-public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppDatasetService,AppDatasetEntity,Long> {
+public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppDatasetService, AppDatasetEntity, Long> {
 
     @Autowired
     private ParamService paramService;
 
-    public AppDatasetController(){
-        super.setModuleDesc( "自助终端应用数据集");
+    public AppDatasetController() {
+        super.setModuleDesc("自助终端应用数据集");
     }
 
     @Override
@@ -46,4 +61,23 @@ public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppD
     }
 
 
+    @Override
+    protected void doListBefore(AppDatasetEntity query, Map<String, Object> model, Context context) throws AppException {
+        if (!ObjectUtils.isEmpty(query.getFieldCode())||!ObjectUtils.isEmpty(query.getFieldName())) {
+            AppDatasetQuery appDatasetQuery = new AppDatasetQuery();
+            appDatasetQuery.setFieldCode(query.getFieldCode());
+            appDatasetQuery.setFieldName(query.getFieldName());
+            appDatasetQuery.setAppId(query.getAppId());
+            String fieldValue = StrUtil.addPrefixIfNot(query.getFieldValue(), "%");
+            fieldValue = StrUtil.addSuffixIfNot(fieldValue, "%");
+            appDatasetQuery.setFieldValue(fieldValue);
+            PageInfo pageInfo = this.buildPageInfo(query);
+            Result<AppInfoFieldEntity> customResult = this.service.findCustomList(appDatasetQuery, pageInfo, context);
+            List<Long> datasetIdList = customResult.getList().stream().map(item -> item.getDatasetId()).collect(Collectors.toList());
+            if (!ObjectUtils.isEmpty(datasetIdList)) {
+                query.setIdList(datasetIdList);
+            }
+        }
+        super.doListBefore(query, model, context);
+    }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterInfo.java

+package com.mortals.xhx.module.matter.model.vo;
+
+import com.mortals.framework.model.BaseEntityLong;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 微官网事项
+ *
+ * @author:
+ * @date: 2022/12/14 9:26
+ */
+@Data
+public class MatterInfo {
+
+    /**
+     * 事项id
+     */
+    private Long id;
+
+    /**
+     * 事项名称
+     */
+    private String matterName;
+
+    /**
+     * 事项编号
+     */
+    private String matterNo;
+
+    /**
+     * 办理地点
+     */
+    private String operateSite;
+
+    /**
+     * 办理部门
+     */
+    private String deptName;
+
+    /**
+     * 窗口到现场次数
+     */
+    private Integer windowToTheSceneNum;
+
+    /**
+     * 网办到现场次数
+     */
+    private Integer onlineToTheSceneNum;
+
+    /**
+     * 承诺办结时限
+     */
+    private String promiseTimeLimitShow;
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterVo.java

@@ -14,4 +14,6 @@ import java.util.List;
 @Data
 public class MatterVo extends BaseEntityLong {
 
+    private List<Long> idList;
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterService.java

 package com.mortals.xhx.module.matter.service;
+
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
@@ -7,6 +8,8 @@ import com.mortals.framework.model.Result;
 import com.mortals.framework.service.ICRUDCacheService;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.matter.model.MatterEntity;
+import com.mortals.xhx.module.matter.model.MatterQuery;
+import com.mortals.xhx.module.matter.model.vo.MatterInfo;
 import com.mortals.xhx.module.site.model.SiteEntity;
 import com.mortals.xhx.module.site.model.SiteMatterEntity;
 import com.mortals.xhx.module.site.model.SiteMatterQuery;
@@ -16,17 +19,18 @@ import org.w3c.dom.Document;
 import java.util.Map;
 
 /**
-* MatterService
-*
-* 基础事项 service接口
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public interface MatterService extends ICRUDService<MatterEntity,Long> {
+ * MatterService
+ * <p>
+ * 基础事项 service接口
+ *
+ * @author zxfei
+ * @date 2022-01-12
+ */
+public interface MatterService extends ICRUDService<MatterEntity, Long> {
 
     /**
      * 添加业务到站点
+     *
      * @param matterIds
      * @param siteId
      * @param context
@@ -35,17 +39,19 @@ public interface MatterService extends ICRUDService<MatterEntity,Long> {
 
     /**
      * 同步政务网事项数据
+     *
      * @param areaCode
      * @param context
      */
-    void syncMatter(String areaCode,Context context);
+    void syncMatter(String areaCode, Context context);
 
-    Map<String,String> getBaseInfoMap(Context context);
+    Map<String, String> getBaseInfoMap(Context context);
 
-    Map<String,String> getSqclInfoMap(Context context);
+    Map<String, String> getSqclInfoMap(Context context);
 
     /**
      * 构建事项详细相关信息
+     *
      * @param matterEntity
      * @param context
      */
@@ -53,12 +59,14 @@ public interface MatterService extends ICRUDService<MatterEntity,Long> {
 
     /**
      * 添加业务到站点
+     *
      * @param matterEntity
      * @param context
      */
     Rest<SiteMatterEntity> switchMatterToSiteMatterr(MatterEntity matterEntity, SiteEntity siteEntity, Context context);
 
 
-
     Result<MatterEntity> findSubList(MatterEntity matterQuery, PageInfo pageInfo, Context context) throws AppException;
+
+    Result<MatterInfo> findMicroList(MatterQuery matterQuery, PageInfo pageInfo, Context context) throws AppException;
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java

@@ -18,11 +18,13 @@ import com.mortals.xhx.base.framework.config.InterceptorConfig;
 import com.mortals.xhx.common.code.FiletypeEnum;
 import com.mortals.xhx.common.code.SourceEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.common.utils.MatterDetailHtmlParseUtil;
 import com.mortals.xhx.module.dept.model.DeptEntity;
 import com.mortals.xhx.module.dept.service.DeptService;
 import com.mortals.xhx.module.matter.dao.MatterDao;
 import com.mortals.xhx.module.matter.model.*;
+import com.mortals.xhx.module.matter.model.vo.MatterInfo;
 import com.mortals.xhx.module.matter.service.*;
 import com.mortals.xhx.module.matters.model.MattersDetailEntity;
 import com.mortals.xhx.module.matters.model.MattersDetailQuery;
@@ -39,6 +41,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
@@ -209,6 +212,21 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
         return this.dao.getSubList(matterQuery, pageInfo);
     }
 
+    @Override
+    public Result<MatterInfo> findMicroList(MatterQuery matterQuery, PageInfo pageInfo, Context context) throws AppException {
+        Result<MatterInfo> matterInfoResult = new Result<>();
+        Result<MatterEntity> matterEntityResult = this.find(matterQuery, pageInfo, context);
+        List<MatterInfo> matterInfoList = matterEntityResult.getList().stream().map(item -> {
+            MatterInfo matterInfo = new MatterInfo();
+            BeanUtils.copyProperties(item, matterInfo, BeanUtil.getNullPropertyNames(item));
+            return matterInfo;
+        }).collect(Collectors.toList());
+        matterInfoResult.setList(matterInfoList);
+        matterInfoResult.setPageInfo(pageInfo);
+
+        return matterInfoResult;
+    }
+
 
     @Override
     public void syncMatter(String areaCode, Context context) {

base-manager/src/main/java/com/mortals/xhx/module/matters/service/MattersService.java

@@ -11,4 +11,7 @@ import com.mortals.xhx.module.matters.model.MattersEntity;
 */
 public interface MattersService extends ICRUDService<MattersEntity,Long>{
 
+
+
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/workman/model/WorkmanEntity.java

 package com.mortals.xhx.module.workman.model;
 
-import com.alibaba.fastjson.JSON;
-import com.mortals.xhx.common.utils.BeanUtil;
+import java.util.Date;
+import java.util.List;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.workman.model.vo.WorkmanVo;
-import org.springframework.beans.BeanUtils;
-
 /**
  * 工作人员实体对象
  *
  * @author zxfei
- * @date 2022-09-19
+ * @date 2022-12-23
  */
 
 public class WorkmanEntity extends WorkmanVo {
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 登录用户名
+     */
+    private String loginName;
+    /**
+     * 密码
+     */
+    private String loginPwd;
     /**
      * 部门id号
      */
@@ -63,6 +73,14 @@ public class WorkmanEntity extends WorkmanVo {
      * 党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)
      */
     private Integer dangyuan;
+    /**
+     * 党员扩展
+     */
+    private String dangyuanext;
+    /**
+     * 身份证
+     */
+    private String idCard;
     /**
      * 电话
      */
@@ -100,21 +118,49 @@ public class WorkmanEntity extends WorkmanVo {
      */
     private Integer online;
     /**
-     * 用户登录名
+     * 配置站点模块，逗号分隔
      */
-    private String loginName;
+    private String modelIds;
     /**
-     * 密码
+     * 最后一次登录时间
      */
-    private String loginPwd;
+    private Date lastLoginTime;
     /**
-     * 党员扩展信息
+     * 最后一次登录地址
      */
-    private String dangyuanext;
+    private String lastLoginAddress;
 
 
 
     public WorkmanEntity(){}
+    /**
+     * 获取 登录用户名
+     * @return String
+     */
+    public String getLoginName(){
+        return loginName;
+    }
+    /**
+     * 设置 登录用户名
+     * @param loginName
+     */
+    public void setLoginName(String loginName){
+        this.loginName = loginName;
+    }
+    /**
+     * 获取 密码
+     * @return String
+     */
+    public String getLoginPwd(){
+        return loginPwd;
+    }
+    /**
+     * 设置 密码
+     * @param loginPwd
+     */
+    public void setLoginPwd(String loginPwd){
+        this.loginPwd = loginPwd;
+    }
     /**
      * 获取 部门id号
      * @return Long
@@ -283,6 +329,34 @@ public class WorkmanEntity extends WorkmanVo {
     public void setDangyuan(Integer dangyuan){
         this.dangyuan = dangyuan;
     }
+    /**
+     * 获取 党员扩展
+     * @return String
+     */
+    public String getDangyuanext(){
+        return dangyuanext;
+    }
+    /**
+     * 设置 党员扩展
+     * @param dangyuanext
+     */
+    public void setDangyuanext(String dangyuanext){
+        this.dangyuanext = dangyuanext;
+    }
+    /**
+     * 获取 身份证
+     * @return String
+     */
+    public String getIdCard(){
+        return idCard;
+    }
+    /**
+     * 设置 身份证
+     * @param idCard
+     */
+    public void setIdCard(String idCard){
+        this.idCard = idCard;
+    }
     /**
      * 获取 电话
      * @return String
@@ -410,46 +484,46 @@ public class WorkmanEntity extends WorkmanVo {
         this.online = online;
     }
     /**
-     * 获取 用户登录名
+     * 获取 配置站点模块，逗号分隔
      * @return String
      */
-    public String getLoginName(){
-        return loginName;
+    public String getModelIds(){
+        return modelIds;
     }
     /**
-     * 设置 用户登录名
-     * @param loginName
+     * 设置 配置站点模块，逗号分隔
+     * @param modelIds
      */
-    public void setLoginName(String loginName){
-        this.loginName = loginName;
+    public void setModelIds(String modelIds){
+        this.modelIds = modelIds;
     }
     /**
-     * 获取 密码
-     * @return String
+     * 获取 最后一次登录时间
+     * @return Date
      */
-    public String getLoginPwd(){
-        return loginPwd;
+    public Date getLastLoginTime(){
+        return lastLoginTime;
     }
     /**
-     * 设置 密码
-     * @param loginPwd
+     * 设置 最后一次登录时间
+     * @param lastLoginTime
      */
-    public void setLoginPwd(String loginPwd){
-        this.loginPwd = loginPwd;
+    public void setLastLoginTime(Date lastLoginTime){
+        this.lastLoginTime = lastLoginTime;
     }
     /**
-     * 获取 党员扩展信息
+     * 获取 最后一次登录地址
      * @return String
      */
-    public String getDangyuanext(){
-        return dangyuanext;
+    public String getLastLoginAddress(){
+        return lastLoginAddress;
     }
     /**
-     * 设置 党员扩展信息
-     * @param dangyuanext
+     * 设置 最后一次登录地址
+     * @param lastLoginAddress
      */
-    public void setDangyuanext(String dangyuanext){
-        this.dangyuanext = dangyuanext;
+    public void setLastLoginAddress(String lastLoginAddress){
+        this.lastLoginAddress = lastLoginAddress;
     }
 
 
@@ -473,6 +547,8 @@ public class WorkmanEntity extends WorkmanVo {
 
     public String toString(){
         StringBuilder sb = new StringBuilder("");
+        sb.append(",loginName:").append(getLoginName());
+        sb.append(",loginPwd:").append(getLoginPwd());
         sb.append(",deptId:").append(getDeptId());
         sb.append(",deptName:").append(getDeptName());
         sb.append(",windowId:").append(getWindowId());
@@ -485,6 +561,8 @@ public class WorkmanEntity extends WorkmanVo {
         sb.append(",posttitle:").append(getPosttitle());
         sb.append(",politicalstatus:").append(getPoliticalstatus());
         sb.append(",dangyuan:").append(getDangyuan());
+        sb.append(",dangyuanext:").append(getDangyuanext());
+        sb.append(",idCard:").append(getIdCard());
         sb.append(",phone:").append(getPhone());
         sb.append(",mobile:").append(getMobile());
         sb.append(",starlevel:").append(getStarlevel());
@@ -494,23 +572,27 @@ public class WorkmanEntity extends WorkmanVo {
         sb.append(",promise:").append(getPromise());
         sb.append(",business:").append(getBusiness());
         sb.append(",online:").append(getOnline());
-        sb.append(",loginName:").append(getLoginName());
-        sb.append(",loginPwd:").append(getLoginPwd());
-        sb.append(",dangyuanext:").append(getDangyuanext());
+        sb.append(",modelIds:").append(getModelIds());
+        sb.append(",lastLoginTime:").append(getLastLoginTime());
+        sb.append(",lastLoginAddress:").append(getLastLoginAddress());
         return sb.toString();
     }
 
     public void initAttrValue(){
 
-        this.deptId = 0L;
+        this.loginName = "";
+
+        this.loginPwd = "";
+
+        this.deptId = null;
 
         this.deptName = "";
 
-        this.windowId = 0L;
+        this.windowId = null;
 
         this.windowName = "";
 
-        this.siteId = 0L;
+        this.siteId = null;
 
         this.siteName = "";
 
@@ -526,6 +608,10 @@ public class WorkmanEntity extends WorkmanVo {
 
         this.dangyuan = 0;
 
+        this.dangyuanext = "";
+
+        this.idCard = "";
+
         this.phone = "";
 
         this.mobile = "";
@@ -536,34 +622,18 @@ public class WorkmanEntity extends WorkmanVo {
 
         this.photoPath = "";
 
-        this.duty = "";
+        this.duty = null;
 
-        this.promise = "";
+        this.promise = null;
 
-        this.business = "";
+        this.business = null;
 
         this.online = 1;
 
-        this.loginName = "";
-
-        this.loginPwd = "";
-
-        this.dangyuanext = "";
-    }
-
-
-    public static void main(String[] args) {
-
-        WorkmanEntity source = new WorkmanEntity();
-        source.setLoginName("admin");
-        source.setLoginPwd("123456");
-
-        WorkmanEntity workmanEntity = new WorkmanEntity();
-        workmanEntity.initAttrValue();
+        this.modelIds = "";
 
-        //BeanUtils.copyProperties(source,workmanEntity, BeanUtil.getNullPropertyNames(source));
-        BeanUtils.copyProperties(workmanEntity,source, BeanUtil.getNullPropertyNames(workmanEntity));
+        this.lastLoginTime = null;
 
-        System.out.println(JSON.toJSONString(source));
+        this.lastLoginAddress = null;
     }
 }
\ No newline at end of file

base-manager/src/main/resources/baseinfo.setting

@@ -160,5 +160,9 @@
 是否支持网上支付 = isOnlinePayShow
 是否支持物流快递 = isExpressTakeOnlineShow
 网办类型 = onlineType
+乡镇街道名称 = townshipName
+乡镇街道代码 = townshipCode
+村居社区名称 = villageName
+村居社区代码 = villageCode
 
 

base-manager/src/main/resources/logback-spring.xml

@@ -62,13 +62,12 @@
         <appender-ref ref="fileError"/>
     </logger>
 
-    <logger name="com.mortals.xhx.module" level="info" additivity="false">
+    <logger name="com.mortals.xhx.module" level="debug" additivity="false">
         <appender-ref ref="console"/>
         <appender-ref ref="fileInfo"/>
         <appender-ref ref="fileError"/>
     </logger>
 
-
 <!--    <logger name="com.mortals.xhx.module">
         <level value="debug"/>
     </logger>-->

base-manager/src/main/resources/sqlmap/module/app/AppDatasetMapperExt.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.app.dao.ibatis.AppDatasetDaoImpl">
+
+    <select id="getCustomListCount" parameterType="paramDto" resultType="int">
+        SELECT
+        count( 1 )
+        FROM
+        mortals_sys_app_dataset a
+        LEFT JOIN mortals_sys_app_info_field b ON a.id = b.datasetId
+        <trim suffixOverrides="where" suffix="">
+            where 1=1 and
+            <trim prefixOverrides="and" prefix="">
+                <if test="condition.appId!=null and condition.appId!=''">
+                    and a.appId = #{condition.appId,jdbcType=VARCHAR}
+                </if>
+                <if test="condition.fieldCode!=null and condition.fieldCode!=''">
+                    and b.fieldCode = #{condition.fieldCode,jdbcType=VARCHAR}
+                </if>
+                <if test="condition.fieldName!=null and condition.fieldName!=''">
+                    and b.fieldName = #{condition.fieldName,jdbcType=VARCHAR}
+                </if>
+                <if test="condition.fieldValue != null and condition.fieldValue != ''">
+                    and b.fieldValue like #{condition.fieldValue}
+                </if>
+
+            </trim>
+        </trim>
+    </select>
+
+    <!-- 获取事项差集列表列表 -->
+    <select id="getCustomList" parameterType="paramDto" resultMap="AppInfoFieldEntity-Map">
+        SELECT
+        <include refid="_columns_sub"/>
+        FROM
+        mortals_sys_app_dataset a
+        LEFT JOIN mortals_sys_app_info_field b ON a.id = b.datasetId
+        <trim suffixOverrides="where" suffix="">
+            where 1=1 and
+            <trim prefixOverrides="and" prefix="">
+                <if test="condition.appId!=null and condition.appId!=''">
+                    and a.appId = #{condition.appId,jdbcType=VARCHAR}
+                </if>
+                <if test="condition.fieldCode!=null and condition.fieldCode!=''">
+                    and b.fieldCode = #{condition.fieldCode,jdbcType=VARCHAR}
+                </if>
+                <if test="condition.fieldName!=null and condition.fieldName!=''">
+                    and b.fieldName = #{condition.fieldName,jdbcType=VARCHAR}
+                </if>
+                <if test="condition.fieldValue != null and condition.fieldValue != ''">
+                    and b.fieldValue like #{condition.fieldValue}
+                </if>
+            </trim>
+        </trim>
+    </select>
+</mapper>
\ No newline at end of file

base-manager/src/main/resources/sqlmap/module/app/AppMapper.xml

@@ -13,6 +13,7 @@
         <result property="appIconPath" column="appIconPath" />
         <result property="appThemeName" column="appThemeName" />
         <result property="type" column="type" />
+        <result property="url" column="url" />
         <result property="downDevCount" column="downDevCount" />
         <result property="shelves" column="shelves" />
         <result property="appType" column="appType" />
@@ -65,6 +66,9 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('type') or colPickMode == 1 and data.containsKey('type')))">
                 a.type,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('url') or colPickMode == 1 and data.containsKey('url')))">
+                a.url,
+            </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('downDevCount') or colPickMode == 1 and data.containsKey('downDevCount')))">
                 a.downDevCount,
             </if>
@@ -118,18 +122,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="AppEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_sys_app
-        (siteId,siteName,appCode,appName,appIconPath,appThemeName,type,downDevCount,shelves,appType,fileName,filePath,distributeFilePath,version,summary,notes,distribute,dataUpdate,createTime,updateUserId,updateTime)
+        (siteId,siteName,appCode,appName,appIconPath,appThemeName,type,url,downDevCount,shelves,appType,fileName,filePath,distributeFilePath,version,summary,notes,distribute,dataUpdate,createTime,updateUserId,updateTime)
         VALUES
-        (#{siteId},#{siteName},#{appCode},#{appName},#{appIconPath},#{appThemeName},#{type},#{downDevCount},#{shelves},#{appType},#{fileName},#{filePath},#{distributeFilePath},#{version},#{summary},#{notes},#{distribute},#{dataUpdate},#{createTime},#{updateUserId},#{updateTime})
+        (#{siteId},#{siteName},#{appCode},#{appName},#{appIconPath},#{appThemeName},#{type},#{url},#{downDevCount},#{shelves},#{appType},#{fileName},#{filePath},#{distributeFilePath},#{version},#{summary},#{notes},#{distribute},#{dataUpdate},#{createTime},#{updateUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_sys_app
-        (siteId,siteName,appCode,appName,appIconPath,appThemeName,type,downDevCount,shelves,appType,fileName,filePath,distributeFilePath,version,summary,notes,distribute,dataUpdate,createTime,updateUserId,updateTime)
+        (siteId,siteName,appCode,appName,appIconPath,appThemeName,type,url,downDevCount,shelves,appType,fileName,filePath,distributeFilePath,version,summary,notes,distribute,dataUpdate,createTime,updateUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.siteId},#{item.siteName},#{item.appCode},#{item.appName},#{item.appIconPath},#{item.appThemeName},#{item.type},#{item.downDevCount},#{item.shelves},#{item.appType},#{item.fileName},#{item.filePath},#{item.distributeFilePath},#{item.version},#{item.summary},#{item.notes},#{item.distribute},#{item.dataUpdate},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.siteId},#{item.siteName},#{item.appCode},#{item.appName},#{item.appIconPath},#{item.appThemeName},#{item.type},#{item.url},#{item.downDevCount},#{item.shelves},#{item.appType},#{item.fileName},#{item.filePath},#{item.distributeFilePath},#{item.version},#{item.summary},#{item.notes},#{item.distribute},#{item.dataUpdate},#{item.createTime},#{item.updateUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -166,6 +170,9 @@
             <if test="(colPickMode==0 and data.containsKey('typeIncrement')) or (colPickMode==1 and !data.containsKey('typeIncrement'))">
                 a.type=ifnull(a.type,0) + #{data.typeIncrement},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('url')) or (colPickMode==1 and !data.containsKey('url'))">
+                a.url=#{data.url},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('downDevCount')) or (colPickMode==1 and !data.containsKey('downDevCount'))">
                 a.downDevCount=#{data.downDevCount},
             </if>
@@ -300,6 +307,13 @@
                     </choose>
                 </foreach>
             </trim>
+            <trim prefix="url=(case" suffix="ELSE url end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('url')) or (colPickMode==1 and !item.containsKey('url'))">
+                        when a.id=#{item.id} then #{item.url}
+                    </if>
+                </foreach>
+            </trim>
             <trim prefix="downDevCount=(case" suffix="ELSE downDevCount end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <choose>
@@ -695,6 +709,21 @@
             ${_conditionType_} a.type <![CDATA[ <= ]]> #{${_conditionParam_}.typeEnd}
         </if>
 
+
+        <if test="conditionParamRef.containsKey('url')">
+            <if test="conditionParamRef.url != null and conditionParamRef.url != ''">
+                ${_conditionType_} a.url like #{${_conditionParam_}.url}
+            </if>
+            <if test="conditionParamRef.url == null">
+                ${_conditionType_} a.url is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('urlList')">
+            ${_conditionType_} a.url in
+            <foreach collection="conditionParamRef.urlList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('downDevCount')">
             <if test="conditionParamRef.downDevCount != null ">
                 ${_conditionType_} a.downDevCount = #{${_conditionParam_}.downDevCount}
@@ -1000,6 +1029,11 @@
                     <if test='orderCol.type != null and "DESC".equalsIgnoreCase(orderCol.type)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('url')">
+                    a.url
+                    <if test='orderCol.url != null and "DESC".equalsIgnoreCase(orderCol.url)'>DESC</if>
+                    ,
+                </if>
                 <if test="orderCol.containsKey('downDevCount')">
                     a.downDevCount
                     <if test='orderCol.downDevCount != null and "DESC".equalsIgnoreCase(orderCol.downDevCount)'>DESC</if>

base-manager/src/test/java/com/mortals/httpclient/app/AppController.http

@@ -19,10 +19,9 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-    "siteId":3,
-    "type":1,
+    "idList":[22,19,20],
     "page":1,
-    "size":10
+    "size":-1
 }
 
 
@@ -87,7 +86,7 @@ Accept: application/json
 
 
 ###自助终端应用删除
-GET {{baseUrl}}/app/delete?id=3
+GET {{baseUrl}}/app/delete?id=18
 Authorization: {{authToken}}
 Accept: application/json
 

base-manager/src/test/java/com/mortals/httpclient/app/AppDatasetController.http

@@ -19,7 +19,9 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-    "appId":1,
+    "appId":20,
+    "fieldName": "标题",
+    "fieldValue": "管理办法",
     "page":1,
     "size":10
 }

base-manager/src/test/java/com/mortals/httpclient/matter/MatterController.http

@@ -20,7 +20,17 @@ POST {{baseUrl}}/matter/list
 Content-Type: application/json
 
 {
-  "deptCode": "1151013266047907X5",
+  "idList": [1,2],
+  "page": 1,
+  "size": 10
+}
+
+###微官网事项列表
+POST {{baseUrl}}/micro/matter/list
+Content-Type: application/json
+
+{
+  "idList": [1,2],
   "page": 1,
   "size": 10
 }

deploy.sh

@@ -123,7 +123,7 @@ writelog() {
 }
 
 unix_is_centos() {
-  if [ ! -f "/etc/redhat-release" ]; then
+  if [ -f "/etc/redhat-release" ]; then
     writelog "centos"
   else
     writelog "ubuntu"
@@ -144,8 +144,8 @@ setup_java() {
   system_version=$(unix_is_centos)
   if [[ ${system_version} == "centos" ]]; then
     writelog "centos java clear"
-    yum -y remove java-*-openjdk* #卸载centos中的openjdk
-    yum -y remove tzdata-java.noarch
+   # yum -y remove java-*-openjdk* #卸载centos中的openjdk
+    #yum -y remove tzdata-java.noarch
   else
     writelog "ubuntu java clear"
     apt-get purge openjdk*
@@ -154,21 +154,22 @@ setup_java() {
   rm -rf ${JAVA_HOME}
   mkdir -p ${JAVA_HOME}
   cpu_info=$(check_cpu)
+  echo "${cpu_info}"
   if [[ ${cpu_info} == *${ARM_64}* ]]; then
-    tar -zvx ${BASEDIR}/soft/java/arm_64/${JAVA_ARM_FILENAME} -C ${JAVA_HOME} --strip-components 1
+    tar -zvxf ${BASEDIR}/soft/java/arm_64/${JAVA_ARM_FILENAME} -C ${JAVA_HOME} --strip-components 1
     echo "arm64"
   elif [[ ${cpu_info} == *${X86_64}* ]]; then
-    tar -zvx ${BASEDIR}/soft/java/x86_64/${JAVA_FILENAME} -C ${JAVA_HOME} --strip-components 1
+    tar -zvxf ${BASEDIR}/soft/java/x86_64/${JAVA_FILENAME} -C ${JAVA_HOME} --strip-components 1
     echo "x86_64"
   else
-    tar -zvx ${BASEDIR}/soft/java/x86_64/${JAVA_FILENAME} -C ${JAVA_HOME} --strip-components 1
+    tar -zvxf ${BASEDIR}/soft/java/x86_64/${JAVA_FILENAME} -C ${JAVA_HOME} --strip-components 1
     echo "x86_64"
   fi
 
-  export JAVA_HOME=${JAVA_HOME}
-  export JRE_HOME=$JAVA_HOME/jre
-  export CLASSPATH=.:$JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/tools.jar:$JRE_HOME/lib
-  export PATH=$PATH:$JAVA_HOME/bin:$JRE_HOME/bin
+  echo "export JAVA_HOME=${JAVA_HOME}" >>/etc/profile
+  echo "export JRE_HOME=$JAVA_HOME/jre" >>/etc/profile
+  echo "export CLASSPATH=.:$JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/tools.jar:$JRE_HOME/lib" >>/etc/profile
+  echo "export PATH=$PATH:$JAVA_HOME/bin:$JRE_HOME/bin" >>/etc/profile
   source /etc/profile #使配置立即生效
   #检查Java安装和配置
   cd $BASEDIR
@@ -179,8 +180,9 @@ setup_redis() {
   writelog "setup redis start"
   rm -rf ${REDIS_EXECPATH}
   mkdir -p ${REDIS_EXECPATH}
-  tar -zvx ${BASEDIR}/soft/${REDIS}/${REDIS_FILENAME} -C ${REDIS_EXECPATH} --strip-components 1
+  tar -zvxf ${BASEDIR}/soft/${REDIS}/${REDIS_FILENAME} -C ${REDIS_EXECPATH} --strip-components 1
   cd ${REDIS_EXECPATH}
+  writelog "redis make start"
   make
   make PREFIX=${REDIS_EXECPATH} install
 
@@ -223,7 +225,8 @@ setup_mysql() {
   groupadd mysql
   useradd -r -g mysql mysql
 
-  tar -zvx ${BASEDIR}/soft/${MYSQL}/${MYSQL_CENTOS_FILENAME} -C ${MYSQL_EXECPATH} --strip-components 1
+  writelog "exccmd  tar -zvxf ${BASEDIR}/soft/${MYSQL}/${MYSQL_CENTOS_FILENAME} -C ${MYSQL_EXECPATH} --strip-components 1"
+  tar -zvxf ${BASEDIR}/soft/${MYSQL}/${MYSQL_CENTOS_FILENAME} -C ${MYSQL_EXECPATH} --strip-components 1
   cd ${MYSQL_EXECPATH}
   chown mysql:mysql mysql-files
   chmod 750 mysql-file
@@ -296,17 +299,22 @@ setup_nginx() {
   if [[ ${system_version} == "centos" ]]; then
     writelog "centos nginx clear"
     yum remove nginx
+    writelog "nginx depend install"
+    yum -y install pcre-devel openssl openssl-devel gd-devel gcc gcc-c++
   else
     writelog "ubuntu nginx clear"
     apt-get purge nginx*
+    apt-get -y install pcre-devel openssl openssl-devel gd-devel gcc gcc-c++
   fi
 
   rm -rf ${NGINX_EXECPATH}
   mkdir -p ${NGINX_EXECPATH}
-  tar -zvx ${BASEDIR}/soft/${NGINX}/${NGINX_FILENAME} -C ${NGINX_EXECPATH} --strip-components 1
+  writelog "解压nginx:tar -zvxf ${BASEDIR}/soft/${NGINX}/${NGINX_FILENAME} -C ${NGINX_EXECPATH} --strip-components 1"
+  tar -zvxf ${BASEDIR}/soft/${NGINX}/${NGINX_FILENAME} -C ${NGINX_EXECPATH} --strip-components 1
   cd ${NGINX_EXECPATH}
 
   ./configure --prefix=${NGINX_EXECPATH} --conf-path=${NGINX_CONF}
+  writelog "nginx make start"
   make
   make install
 
@@ -331,6 +339,8 @@ setup_nginx() {
   systemctl daemon-reload
   systemctl start ${NGINX}
 
+  ln -s /usr/local/nginx/sbin/nginx /usr/sbin/
+
   writelog "setup nginx finish"
 
 }
@@ -423,15 +433,17 @@ nacos_deploy() {
   rm -rf ${NACOS_SERVICE}
   rm -rf ${NACOS_EXECPATH}
   mkdir -p ${NACOS_EXECPATH}
-  tar -zvx $BASEDIR/release/nacos/${NACOS_FILENAME} -C ${NACOS_EXECPATH} --strip-components 1
+  writelog "tar -zvxf $BASEDIR/release/nacos/${NACOS_FILENAME} -C ${NACOS_EXECPATH} --strip-components 1"
+  tar -zvxf $BASEDIR/release/nacos/${NACOS_FILENAME} -C ${NACOS_EXECPATH} --strip-components 1
   writelog "${NACOS}_deploy init db..."
+  writelog " mysql -h${MYSQL_HOST} -P${MYSQL_PORT} -u${MYSQL_USER} -p${MYSQL_PASSWORD} <${NACOS_EXECPATH}/db/nacos.sql"
   mysql -h${MYSQL_HOST} -P${MYSQL_PORT} -u${MYSQL_USER} -p${MYSQL_PASSWORD} <${NACOS_EXECPATH}/db/nacos.sql
 
   echo "" >$NACOS_SERVICE
   echo "[Unit]" >>$NACOS_SERVICE
   echo "Description=nacos" >>$NACOS_SERVICE
   echo "After=network.target" >>$NACOS_SERVICE
-  echo "" >>$NACOS_SERVICE
+  echo "" >>$NACOS_SERVICE,mq
   echo "[Service]" >>$NACOS_SERVICE
   echo "Environment=\"JAVA_HOME=$JAVA_HOME\"" >>$NACOS_SERVICE
   echo "Type=forking" >>$NACOS_SERVICE
@@ -454,7 +466,7 @@ nacos_deploy() {
 smart_gateway_deploy() {
   writelog "${SMART_GATEWAY}_deploy"
   clear_deploy ${SMART_GATEWAY} ${SMART_GATEWAY_SERVICE} ${SMART_GATEWAY_EXECPATH}
-  tar -zvx ${BASEDIR}/release/${SMART_GATEWAY}/${SMART_GATEWAY_FILENAME} -C ${PUBLISH_PATH}
+  tar -zvxf ${BASEDIR}/release/${SMART_GATEWAY}/${SMART_GATEWAY_FILENAME} -C ${PUBLISH_PATH}
 
   build_service ${SMART_GATEWAY} ${SMART_GATEWAY_SERVICE} ${SMART_GATEWAY_EXECPATH}
 
@@ -469,8 +481,8 @@ smart_portal_platform_deploy() {
   clear_ui_deploy ${SMART_PORTAL_PLATFORM_UI_EXECPATH}
   writelog "${SMART_PORTAL_PLATFORM_UI_EXECPATH}_clear_finish"
 
-  tar -zvx ${BASEDIR}/release/${SMART_PORTAL_PLATFORM}/${SMART_PORTAL_PLATFORM_FILENAME} -C ${PUBLISH_PATH}
-  tar -zvx ${BASEDIR}/release/${SMART_PORTAL_PLATFORM}/${SMART_PORTAL_PLATFORM_UI_FILENAME} -C ${PUBLISH_PATH}
+  tar -zvxf ${BASEDIR}/release/${SMART_PORTAL_PLATFORM}/${SMART_PORTAL_PLATFORM_FILENAME} -C ${PUBLISH_PATH}
+  tar -zvxf ${BASEDIR}/release/${SMART_PORTAL_PLATFORM}/${SMART_PORTAL_PLATFORM_UI_FILENAME} -C ${PUBLISH_PATH}
 
   mysql -h${MYSQL_HOST} -P${MYSQL_PORT} -u${MYSQL_USER} -p${MYSQL_PASSWORD} <${SMART_PORTAL_PLATFORM_EXECPATH}/db/db.sql
   mysql -h${MYSQL_HOST} -P${MYSQL_PORT} -u${MYSQL_USER} -p${MYSQL_PASSWORD} <${SMART_PORTAL_PLATFORM_EXECPATH}/db/menu.sql
@@ -487,8 +499,8 @@ smart_base_platform_deploy() {
   clear_ui_deploy ${SMART_BASE_PLATFORM_UI_EXECPATH}
   writelog "${SMART_BASE_PLATFORM_UI_EXECPATH}_clear_finish"
 
-  tar -zvx ${BASEDIR}/release/${SMART_BASE_PLATFORM}/${SMART_BASE_PLATFORM_FILENAME} -C ${PUBLISH_PATH}
-  tar -zvx ${BASEDIR}/release/${SMART_BASE_PLATFORM}/${SMART_BASE_PLATFORM_UI_FILENAME} -C ${PUBLISH_PATH}
+  tar -zvxf ${BASEDIR}/release/${SMART_BASE_PLATFORM}/${SMART_BASE_PLATFORM_FILENAME} -C ${PUBLISH_PATH}
+  tar -zvxf ${BASEDIR}/release/${SMART_BASE_PLATFORM}/${SMART_BASE_PLATFORM_UI_FILENAME} -C ${PUBLISH_PATH}
 
   mysql -h${MYSQL_HOST} -P${MYSQL_PORT} -u${MYSQL_USER} -p${MYSQL_PASSWORD} <${SMART_BASE_PLATFORM_EXECPATH}/db/base.sql
   mysql -h${MYSQL_HOST} -P${MYSQL_PORT} -u${MYSQL_USER} -p${MYSQL_PASSWORD} <${SMART_BASE_PLATFORM_EXECPATH}/db/base_modules.sql
@@ -509,8 +521,8 @@ device_platform_deploy() {
   clear_ui_deploy ${DEVICE_PLATFORM_UI_EXECPATH}
   writelog "${SMA_PLATFORM_UI_EXECPATH}_clear_finish"
 
-  tar -zvx ${BASEDIR}/release/${DEVICE_PLATFORM}/${DEVICE_PLATFORM_FILENAME} -C ${PUBLISH_PATH}
-  tar -zvx ${BASEDIR}/release/${DEVICE_PLATFORM}/${DEVICE_PLATFORM_UI_FILENAME} -C ${PUBLISH_PATH}
+  tar -zvxf ${BASEDIR}/release/${DEVICE_PLATFORM}/${DEVICE_PLATFORM_FILENAME} -C ${PUBLISH_PATH}
+  tar -zvxf ${BASEDIR}/release/${DEVICE_PLATFORM}/${DEVICE_PLATFORM_UI_FILENAME} -C ${PUBLISH_PATH}
 
   mysql -h${MYSQL_HOST} -P${MYSQL_PORT} -u${MYSQL_USER} -p${MYSQL_PASSWORD} <${DEVICE_PLATFORM_EXECPATH}/db/base.sql
   mysql -h${MYSQL_HOST} -P${MYSQL_PORT} -u${MYSQL_USER} -p${MYSQL_PASSWORD} <${DEVICE_PLATFORM_EXECPATH}/db/module.sql
@@ -530,8 +542,8 @@ log_platform_deploy() {
   clear_ui_deploy ${LOG_PLATFORM_UI_EXECPATH}
   writelog "${LOG_PLATFORM_UI_EXECPATH}_clear_finish"
 
-  tar -zvx ${BASEDIR}/release/${LOG_PLATFORM}/${LOG_PLATFORM_FILENAME} -C ${PUBLISH_PATH}
-  tar -zvx ${BASEDIR}/release/${LOG_PLATFORM}/${LOG_PLATFORM_UI_FILENAME} -C ${PUBLISH_PATH}
+  tar -zvxf ${BASEDIR}/release/${LOG_PLATFORM}/${LOG_PLATFORM_FILENAME} -C ${PUBLISH_PATH}
+  tar -zvxf ${BASEDIR}/release/${LOG_PLATFORM}/${LOG_PLATFORM_UI_FILENAME} -C ${PUBLISH_PATH}
 
   mysql -h${MYSQL_HOST} -P${MYSQL_PORT} -u${MYSQL_USER} -p${MYSQL_PASSWORD} <${LOG_PLATFORM_EXECPATH}/db/base.sql
   mysql -h${MYSQL_HOST} -P${MYSQL_PORT} -u${MYSQL_USER} -p${MYSQL_PASSWORD} <${LOG_PLATFORM_EXECPATH}/db/module.sql
@@ -595,7 +607,7 @@ program_deploy() {
 }
 
 project_deploy() {
-  shell_lock
+  #shell_lock
   init_deploy
   nacos_deploy
   smart_gateway_deploy
@@ -603,7 +615,7 @@ project_deploy() {
   smart_base_platform_deploy
   device_platform_deploy
   log_platform_deploy
-  shell_unlock
+  #shell_unlock
 }
 
 function menu() { #显示菜单