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

base-manager/db/params.sql

@@ -371,4 +371,7 @@ INSERT INTO `mortals_sys_model` VALUES (null, '基础设置平台', 'basic setti
 INSERT INTO `mortals_xhx_task` VALUES (null, '用户同步', 'syncUserTask', 0, 'SyncUserTask', NULL, NULL, 4, 120, '00', NULL, '127.0.1.1', '2023-01-13 15:41:40', 0, '2022-07-06 10:49:48', 1, '系统管理员');
 
 
-INSERT INTO `mortals_xhx_param` VALUES (null, null, null, null, 'domain', 'http://192.168.2.169:11071', '1', '4', '0', null, null, null, null);
+INSERT INTO `mortals_xhx_param` VALUES (null, 'domain', null, null, 'domain', 'http://192.168.0.98:11071', '1', '4', '0', null, null, null, null);
\ No newline at end of file
+
+INSERT INTO `mortals_xhx_param` VALUES (null, 'php访问地址', null, null, 'server_http_url', 'http://192.168.0.98:11078', '1', '4', '0', null, null, null, null);
+INSERT INTO `mortals_xhx_param` VALUES (null, 'php访问地址', null, null, 'server_php_http_url', 'http://192.168.0.98:8090', '1', '4', '0', null, null, null, null);
\ No newline at end of file

base-manager/pom.xml

@@ -120,10 +120,10 @@
                 <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
                 <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
                 <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
-                <profiles.filepath>/home/mortals/app/data</profiles.filepath>
+                <profiles.filepath>/mortals/app/data</profiles.filepath>
                 <profiles.log.level>INFO</profiles.log.level>
                 <package.environment>yibin</package.environment>
-                <skipUi>true</skipUi>
+                <skipUi>false</skipUi>
             </properties>
         </profile>
 

base-manager/src/main/java/com/mortals/xhx/common/code/UploadFileType.java

@@ -14,11 +14,11 @@ public enum UploadFileType implements IBaseEnum {
     /** 图片 */
     IMG(2, "图片", 1024 * 1024 * 10),
     /** 压缩文件 */
-    ZIP(3, "压缩文件", 1024 * 1024 * 100),
+    ZIP(3, "压缩文件", 1024 * 1024 * 500),
     /** PDF */
     PDF(4, "PDF", 1024 * 1024 * 100),
     /** 其他 */
-    OTHER(99, "其他", 1024 * 1024 * 100);
+    OTHER(99, "其他", 1024 * 1024 * 500);
 
     private int value;
     private String desc;

base-manager/src/main/java/com/mortals/xhx/common/key/Constant.java

 package com.mortals.xhx.common.key;
 
+import com.mortals.framework.ap.GlobalSysInfo;
+
 public final class Constant {
 
 	/**
@@ -127,6 +129,10 @@ public final class Constant {
 	 * 服务器http
 	 */
 	public final static String PARAM_SERVER_HTTP_URL = "server_http_url";
+	/**
+	 * 服务器http
+	 */
+	public final static String PARAM_SERVER_PHP_HTTP_URL = "server_php_http_url";
 
 	public final static String CUSTAPP_ROOT_PATH = "app";
 

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java

@@ -16,8 +16,10 @@ import com.mortals.xhx.common.code.AreaLevelDxTypeEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.key.Constant;
 import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.device.DevicePdu;
 import com.mortals.xhx.common.pdu.user.UserPdu;
 import com.mortals.xhx.common.utils.MatterHtmlParseUtil;
+import com.mortals.xhx.feign.device.IDeviceFeign;
 import com.mortals.xhx.feign.user.IUserFeign;
 import com.mortals.xhx.module.area.model.AreaEntity;
 import com.mortals.xhx.module.area.model.AreaQuery;
@@ -63,9 +65,8 @@ import static com.mortals.xhx.common.key.Constant.PARAM_SERVER_HTTP_IMAGE_URL;
  * @date 2022-01-12
  */
 @Service("siteService")
+@Slf4j
 public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteEntity, Long> implements SiteService {
-
-    protected Log log = LogFactory.getLog(this.getClass());
     // private List<SiteTreeSelect> siteTreeList;
     /**
      * 根据用户id 暂存对应站点树 默认0为全站点树
@@ -93,12 +94,10 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
     private SiteThemeMatterService siteThemeMatterService;
     @Autowired
     private SiteMatterService siteMatterService;
-
-
     @Autowired
     private WorkmanService workmanService;
-
-
+    @Autowired
+    private IDeviceFeign deviceFeign;
 
 
     @Override
@@ -109,9 +108,10 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
             //todo
             //更新关联站点名称
             updateAssociateSiteName(entity, context);
-
             //通知设备更新站点信息
-
+            DevicePdu devicePdu = new DevicePdu();
+            devicePdu.setSiteId(entity.getId());
+            deviceFeign.refreshMessage(devicePdu);
         }
         super.updateBefore(entity, context);
     }

base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinBaseServiceImpl.java

 package com.mortals.xhx.module.skin.service.impl;
 
+import cn.hutool.core.net.URLDecoder;
+import cn.hutool.core.net.url.UrlBuilder;
+import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.StrUtil;
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.exception.AppException;
@@ -80,12 +83,18 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
             item.setProductCode(productEntity == null ? "" : productEntity.getProductCode());
             item.setImageResolutionValue(imageResolutionMap.get(entity.getImageResolution() == null ? "1" : entity.getImageResolution()));
             item.setSkinFieldList(skinFieldEntities);
-
+            String domain = GlobalSysInfo.getParamValue(Constant.DOMAIN, "http://192.168.0.98:11071/");
             if (!ObjectUtils.isEmpty(item.getPreviewImagePath())) {
-                item.setPreviewImagePath(StrUtil.removeAllLineBreaks(GlobalSysInfo.getParamValue(Constant.DOMAIN, "http://192.168.0.98:11071/") )+ item.getPreviewImagePath());
+                UrlBuilder builder = UrlBuilder.ofHttp(domain, CharsetUtil.CHARSET_UTF_8).addPath(item.getPreviewImagePath());
+                item.setPreviewImagePath(builder.build());
+                log.info("cssUrl:" + URLDecoder.decode(item.getPreviewImagePath(), CharsetUtil.CHARSET_UTF_8));
+
             }
             if (!ObjectUtils.isEmpty(item.getCssFilePath())) {
-                item.setCssFilePath(StrUtil.removeAllLineBreaks(GlobalSysInfo.getParamValue(Constant.DOMAIN, "http://192.168.0.98:11071/") )+ item.getCssFilePath());
+                UrlBuilder builder = UrlBuilder.ofHttp(domain, CharsetUtil.CHARSET_UTF_8).addPath(item.getCssFilePath());
+                item.setCssFilePath(builder.build());
+                log.info("cssUrl:" + URLDecoder.decode(item.getCssFilePath(), CharsetUtil.CHARSET_UTF_8));
+
             }
         });
         super.findAfter(entity, pageInfo, context, list);
@@ -93,7 +102,11 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
 
     private void updateUrl(SkinFieldEntity field) {
         if ("2".equals(field.getFieldType())) {
-            field.setFieldValue(StrUtil.removeAllLineBreaks(GlobalSysInfo.getParamValue(Constant.DOMAIN, "http://192.168.0.98:11071/")) + field.getFieldValue());
+            String domain = GlobalSysInfo.getParamValue(Constant.DOMAIN, "http://192.168.0.98:11071/");
+            UrlBuilder builder = UrlBuilder.ofHttp(domain, CharsetUtil.CHARSET_UTF_8).addPath(field.getFieldValue());
+            field.setFieldValue(builder.build());
+            log.info("setFieldValue:" + URLDecoder.decode(field.getFieldValue(), CharsetUtil.CHARSET_UTF_8));
+
         }
     }
 

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinBaseController.java

 package com.mortals.xhx.module.skin.web;
+import cn.hutool.core.net.url.UrlBuilder;
+import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.StrUtil;
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.exception.AppException;
@@ -25,6 +27,8 @@ import com.mortals.xhx.module.skin.model.SkinBaseQuery;
 import com.mortals.xhx.module.skin.service.SkinBaseService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
+
+import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -49,7 +53,6 @@ public class SkinBaseController extends BaseCRUDJsonBodyMappingController<SkinBa
     private ParamService paramService;
     @Autowired
     private ProductService productService;
-
     @Autowired
     private SkinFieldService skinFieldService;
 
@@ -90,7 +93,9 @@ public class SkinBaseController extends BaseCRUDJsonBodyMappingController<SkinBa
 
     private void updateUrl(SkinFieldEntity field) {
         if ("2".equals(field.getFieldType())) {
-            field.setFieldValue(StrUtil.removeAllLineBreaks(GlobalSysInfo.getParamValue(Constant.DOMAIN, "http://192.168.0.98:11071/")) + field.getFieldValue());
+            String domain = GlobalSysInfo.getParamValue(Constant.DOMAIN, "http://192.168.0.98:11071/");
+            UrlBuilder builder = UrlBuilder.ofHttp(domain, CharsetUtil.CHARSET_UTF_8).addPath(field.getFieldValue());
+            field.setFieldValue(builder.build());
         }
     }
 

base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowBusinessServiceImpl.java

 package com.mortals.xhx.module.window.service.impl;
 import cn.hutool.core.collection.ListUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.util.HttpUtil;
 import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.module.business.model.BusinessEntity;
 import com.mortals.xhx.module.business.model.BusinessQuery;
@@ -12,6 +16,7 @@ import com.mortals.xhx.module.site.model.SiteEntity;
 import com.mortals.xhx.module.window.model.WindowEntity;
 import com.mortals.xhx.module.window.model.WindowQuery;
 import com.mortals.xhx.module.window.service.WindowService;
+import lombok.extern.slf4j.Slf4j;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +30,9 @@ import org.springframework.util.ObjectUtils;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.mortals.framework.util.HttpUtil.HEADER_CONTENT_TYPE;
+import static com.mortals.xhx.common.key.Constant.PARAM_SERVER_PHP_HTTP_URL;
+
 /**
 * WindowBusinessService
 * 窗口业务 service实现
@@ -33,6 +41,7 @@ import java.util.stream.Collectors;
 * @date 2022-01-12
 */
 @Service("windowBusinessService")
+@Slf4j
 public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBusinessDao, WindowBusinessEntity, Long> implements WindowBusinessService {
     @Autowired
     private WindowService windowService;
@@ -51,4 +60,48 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus
         }
         super.findAfter(entity, pageInfo, context, list);
     }
+
+
+    /**
+     * @param entity
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    protected void saveAfter(WindowBusinessEntity entity, Context context) throws AppException {
+        //通知php更新
+        pushChangeMsg(entity);
+        super.saveAfter(entity, context);
+    }
+
+
+
+    /**
+     * @param entity
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    protected void updateAfter(WindowBusinessEntity entity, Context context) throws AppException {
+        pushChangeMsg(entity);
+        super.updateAfter(entity, context);
+    }
+
+    private  void pushChangeMsg(WindowBusinessEntity entity) {
+        String phpUrl = GlobalSysInfo.getParamValue(PARAM_SERVER_PHP_HTTP_URL, "http://172.15.28.116:8090");
+        phpUrl+="/api/window/winNameChange";
+        HashMap<String, Object> paramsMap = new HashMap<>();
+        paramsMap.put("windowid", entity.getWindowId());
+        paramsMap.put("typeinfo",1);
+        String resp = null;
+        try {
+            Map<String, String> header = new HashMap<>();
+            header.put(HEADER_CONTENT_TYPE, "application/json");
+            log.info("\n thirdPartyUrl=>{} \n reqbody=>{} ", phpUrl, JSON.toJSONString(paramsMap));
+            resp = HttpUtil.doPost(phpUrl, header, JSON.toJSONString(paramsMap, SerializerFeature.WriteMapNullValue));
+            log.info("thirdPartyUrl =>resp:{}", resp);
+        } catch (Exception e) {
+            log.error("异常:", e);
+        }
+    }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowMatterServiceImpl.java

 package com.mortals.xhx.module.window.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.mortals.framework.ap.GlobalSysInfo;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.util.HttpUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.xhx.module.window.dao.WindowMatterDao;
 import com.mortals.xhx.module.window.model.WindowMatterEntity;
 import com.mortals.xhx.module.window.service.WindowMatterService;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.mortals.framework.util.HttpUtil.HEADER_CONTENT_TYPE;
+import static com.mortals.xhx.common.key.Constant.PARAM_SERVER_PHP_HTTP_URL;
+
 /**
-* WindowMatterService
-* 窗口事项 service实现
-*
-* @author zxfei
-* @date 2022-01-12
-*/
+ * WindowMatterService
+ * 窗口事项 service实现
+ *
+ * @author zxfei
+ * @date 2022-01-12
+ */
 @Service("windowMatterService")
+@Slf4j
 public class WindowMatterServiceImpl extends AbstractCRUDServiceImpl<WindowMatterDao, WindowMatterEntity, Long> implements WindowMatterService {
-    
+    /**
+     * @param entity
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    protected void saveAfter(WindowMatterEntity entity, Context context) throws AppException {
+        pushChangeMsg(entity);
+        super.saveAfter(entity, context);
+    }
+
+    /**
+     * @param entity
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    protected void updateAfter(WindowMatterEntity entity, Context context) throws AppException {
+        pushChangeMsg(entity);
+        super.updateAfter(entity, context);
+    }
+
+    private  void pushChangeMsg(WindowMatterEntity entity) {
+        String phpUrl = GlobalSysInfo.getParamValue(PARAM_SERVER_PHP_HTTP_URL, "http://172.15.28.116:8090");
+        phpUrl+="/api/window/winNameChange";
+        HashMap<String, Object> paramsMap = new HashMap<>();
+        paramsMap.put("windowid", entity.getWindowId());
+        paramsMap.put("typeinfo",0);
+        String resp = null;
+        try {
+            Map<String, String> header = new HashMap<>();
+            header.put(HEADER_CONTENT_TYPE, "application/json");
+            log.info("\n thirdPartyUrl=>{} \n reqbody=>{} ", phpUrl, JSON.toJSONString(paramsMap));
+            resp = HttpUtil.doPost(phpUrl, header, JSON.toJSONString(paramsMap, SerializerFeature.WriteMapNullValue));
+            log.info("thirdPartyUrl =>resp:{}", resp);
+        } catch (Exception e) {
+            log.error("异常:", e);
+        }
+    }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowServiceImpl.java

 package com.mortals.xhx.module.window.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
+import com.mortals.framework.util.HttpUtil;
 import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.module.business.model.BusinessEntity;
 import com.mortals.xhx.module.business.model.BusinessQuery;
@@ -18,6 +22,7 @@ import com.mortals.xhx.module.window.service.WindowMatterService;
 import com.mortals.xhx.module.workman.model.WorkmanEntity;
 import com.mortals.xhx.module.workman.model.WorkmanQuery;
 import com.mortals.xhx.module.workman.service.WorkmanService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,12 +31,12 @@ import com.mortals.xhx.module.window.dao.WindowDao;
 import com.mortals.xhx.module.window.service.WindowService;
 import org.springframework.util.ObjectUtils;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.mortals.framework.util.HttpUtil.HEADER_CONTENT_TYPE;
+import static com.mortals.xhx.common.key.Constant.PARAM_SERVER_PHP_HTTP_URL;
+
 /**
  * WindowService
  * 站点部门窗口 service实现
@@ -40,6 +45,7 @@ import java.util.stream.Collectors;
  * @date 2022-01-12
  */
 @Service("windowService")
+@Slf4j
 public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, WindowEntity, Long> implements WindowService {
 
     @Autowired
@@ -138,4 +144,48 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
         }
         super.removeAfter(ids, context, result);
     }
+
+
+    /**
+     * @param entity
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    protected void updateAfter(WindowEntity entity, Context context) throws AppException {
+        super.updateAfter(entity, context);
+        pushChangeMsg(entity);
+    }
+
+    /**
+     * @param entity
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    protected void saveAfter(WindowEntity entity, Context context) throws AppException {
+        super.saveAfter(entity, context);
+        pushChangeMsg(entity);
+    }
+
+    private  void pushChangeMsg(WindowEntity entity) {
+        log.info("pushChangeMsg:{}",JSON.toJSONString(entity));
+        String phpUrl = GlobalSysInfo.getParamValue(PARAM_SERVER_PHP_HTTP_URL, "http://172.15.28.116:8090");
+        phpUrl+="/api/window/winNameChange";
+        HashMap<String, Object> paramsMap = new HashMap<>();
+        paramsMap.put("windowid", entity.getId());
+        paramsMap.put("typeinfo",1);
+
+        phpUrl+="/api/window/winNameChange";
+        String resp = null;
+        try {
+            Map<String, String> header = new HashMap<>();
+            header.put(HEADER_CONTENT_TYPE, "application/json");
+            log.info("\n thirdPartyUrl=>{} \n reqbody=>{} ", phpUrl, JSON.toJSONString(paramsMap));
+            resp = HttpUtil.doPost(phpUrl, header, JSON.toJSONString(paramsMap, SerializerFeature.WriteMapNullValue));
+            log.info("thirdPartyUrl =>resp:{}", resp);
+        } catch (Exception e) {
+            log.error("异常:", e);
+        }
+    }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/window/web/WindowMatterController.java

 package com.mortals.xhx.module.window.web;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.OrderCol;
+import com.mortals.framework.util.HttpUtil;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.feign.rsp.ApiResp;
 import com.mortals.xhx.module.window.model.WindowMatterEntity;
 import com.mortals.xhx.module.window.service.WindowMatterService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Map;
 
+import static com.mortals.framework.util.HttpUtil.HEADER_CONTENT_TYPE;
+import static com.mortals.xhx.common.key.Constant.PARAM_SERVER_PHP_HTTP_URL;
+
 /**
- *
  * 窗口事项
  *
  * @author zxfei
@@ -24,14 +34,15 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("window/matter")
-public class WindowMatterController extends BaseCRUDJsonBodyMappingController<WindowMatterService,WindowMatterEntity,Long> {
+@Slf4j
+public class WindowMatterController extends BaseCRUDJsonBodyMappingController<WindowMatterService, WindowMatterEntity, Long> {
 
     @Autowired
     private ParamService paramService;
 
-    public WindowMatterController(){
+    public WindowMatterController() {
         super.setFormClass(WindowMatterForm.class);
-        super.setModuleDesc( "窗口事项");
+        super.setModuleDesc("窗口事项");
     }
 
 
@@ -44,4 +55,30 @@ public class WindowMatterController extends BaseCRUDJsonBodyMappingController<Wi
         });
         super.doListBefore(query, model, context);
     }
+
+
+    /**
+     * @param entity
+     * @param model
+     * @param context
+     * @return
+     * @throws AppException
+     */
+    @Override
+    protected int saveAfter(WindowMatterEntity entity, Map<String, Object> model, Context context) throws AppException {
+        String phpUrl = GlobalSysInfo.getParamValue(PARAM_SERVER_PHP_HTTP_URL, "http://10.12.185.213:8090");
+        HashMap<String, Object> paramsMap = new HashMap<>();
+        paramsMap.put("windowid", entity.getWindowId());
+        String resp = null;
+        try {
+            Map<String, String> header = new HashMap<>();
+            header.put(HEADER_CONTENT_TYPE, "application/json");
+            log.info("\n thirdPartyUrl=>{} \n reqbody=>{} ", phpUrl, JSON.toJSONString(paramsMap));
+            resp = HttpUtil.doPost(phpUrl, header, JSON.toJSONString(paramsMap, SerializerFeature.WriteMapNullValue));
+            log.info("thirdPartyUrl =>resp:{}", resp);
+        } catch (Exception e) {
+            log.error("异常:", e);
+        }
+        return super.saveAfter(entity, model, context);
+    }
 }
\ No newline at end of file

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

@@ -24,4 +24,8 @@ public class WorkmanVo extends BaseEntityLong {
     @Excel(name = "证件图片", type = Excel.Type.IMPORT, cellType = Excel.ColumnType.IMAGE)
     @JSONField(serialize = false)
     private PictureData picObj;
+
+
+    private String filePath;
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/workman/service/WorkmanService.java

 package com.mortals.xhx.module.workman.service;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.ICRUDCacheService;
 import com.mortals.framework.service.ICRUDService;
@@ -40,4 +41,10 @@ public interface WorkmanService extends ICRUDCacheService<WorkmanEntity,Long> {
     boolean updateUserPwd(String loginName, String oldPwd, String newPwd) throws AppException;
 
 
+
+
+    Rest<Void> doImportPic(String filePath) throws AppException;
+
+
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java

 package com.mortals.xhx.module.workman.service.impl;
 
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.ZipUtil;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.framework.util.SecurityUtil;
 import com.mortals.framework.util.StringUtils;
+import com.mortals.xhx.base.system.upload.service.UploadService;
 import com.mortals.xhx.base.system.user.service.UserService;
+import com.mortals.xhx.common.utils.ZipUtils;
 import com.mortals.xhx.module.workman.dao.WorkmanDao;
 import com.mortals.xhx.module.workman.model.WorkmanEntity;
 import com.mortals.xhx.module.workman.model.WorkmanQuery;
 import com.mortals.xhx.module.workman.service.WorkmanService;
+import lombok.Getter;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -28,6 +40,14 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao,
 
     @Autowired
     private UserService userService;
+    @Autowired
+    private UploadService uploadService;
+
+    @Value("${upload.path}")
+    @Getter
+    private String filePath;
+    @Autowired
+    private WorkmanService workmanService;
 
 
     @Override
@@ -61,7 +81,6 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao,
         } else {
             entity.setLoginPwd(null);
         }
-
         //判断党员是否其它选项，如果
     }
 
@@ -79,7 +98,7 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao,
 
 
     @Override
-    public WorkmanEntity doLogin(String loginName, String password,String loginIp) throws AppException {
+    public WorkmanEntity doLogin(String loginName, String password, String loginIp) throws AppException {
         WorkmanEntity workmanEntity = this.selectOne(new WorkmanQuery().loginName(loginName));
         if (workmanEntity == null || !workmanEntity.getLoginName().equals(loginName)) {
             throw new AppException("用户名不存在！");
@@ -118,4 +137,55 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao,
         dao.update(sysUser);
         return true;
     }
+
+    /**
+     * @param picfilePath
+     * @return
+     * @throws AppException
+     */
+    @Override
+    public Rest<Void> doImportPic(String picfilePath) throws AppException {
+        String disPath = filePath+"/pics/" + FileUtil.getPrefix(picfilePath).trim();
+        String targetFilePath = uploadService.getFilePath(picfilePath);
+        if (FileUtil.isEmpty(new File(targetFilePath))) {
+            throw new AppException("文件不存在！");
+        }
+        //解压图片
+        ZipUtil.unzip(targetFilePath, disPath, Charset.forName("GBK"));
+        //读取目录下的所有图片
+        File[] files = FileUtil.ls(disPath);
+        for (File file : files) {
+            if (file.isFile()) {
+                updateWorkmanPic(file);
+            }
+            if (file.isDirectory()) {
+                File[] subFiles = file.listFiles();
+                for (File subFile : subFiles) {
+                    updateWorkmanPic(subFile);
+                }
+            }
+        }
+
+        return Rest.ok("解析成功");
+    }
+
+    private void updateWorkmanPic(File file) {
+        String userName = FileUtil.getPrefix(file).trim();
+        //根据用户名查询工作人员名称
+        WorkmanEntity workmanEntity = workmanService.selectOne(new WorkmanQuery().name(userName));
+        if (!ObjectUtils.isEmpty(workmanEntity)) {
+            String newName = "/file/uploadfile/" + new Date().getTime() + "." + FileUtil.getSuffix(file);
+            String filePath = uploadService.getFilePath(newName);
+            try {
+                boolean bool = com.mortals.framework.util.FileUtil.write(filePath, FileUtil.readBytes(file), true, true);
+                if (bool) {
+                    workmanEntity.setPhotoPath(newName);
+                    workmanService.update(workmanEntity);
+                }
+            } catch (IOException e) {
+                log.error("写入证照异常", e);
+            }
+
+        }
+    }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java

 package com.mortals.xhx.module.workman.web;
 
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.pinyin.PinyinUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.util.DateUtils;
@@ -108,6 +111,25 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
         }
     }
 
+
+    @PostMapping(value = "doImportPic")
+    public String doImportPic(@RequestBody WorkmanEntity query) {
+        JSONObject ret = new JSONObject();
+        try {
+            log.info("filePath:"+query.getFilePath());
+            Rest<Void> rest = this.service.doImportPic(query.getFilePath());
+            ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+            recordSysLog(request, getCurUser(), "解析工作人员图片成功!");
+            return ret.toJSONString();
+        } catch (Exception e) {
+            log.error("解析工作人员错误", e);
+            ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+            ret.put(KEY_RESULT_MSG, super.convertException(e));
+            return ret.toJSONString();
+        }
+    }
+
+
     @RequestMapping(value = "change/password", method = RequestMethod.POST)
     @UnAuth
     public String changePassword(@RequestBody WorkmanEntity query) {
@@ -160,6 +182,16 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
                 workmanEntity.setSiteId(siteEntity.getId());
                 workmanEntity.setSiteName(siteEntity.getSiteName());
             }
+
+            if(ObjectUtils.isEmpty(workmanEntity.getLoginName())){
+                String loginName = PinyinUtil.getPinyin(workmanEntity.getName(),"");
+                workmanEntity.setLoginName(loginName);
+            }
+
+            if(ObjectUtils.isEmpty(workmanEntity.getLoginPwd())){
+                workmanEntity.setLoginPwd("123");
+            }
+
             if (!ObjectUtils.isEmpty(deptEntity)) {
                 workmanEntity.setDeptId(deptEntity.getId());
                 workmanEntity.setDeptName(deptEntity.getName());
@@ -188,4 +220,11 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
         super.doImportDataBefore(list, updateSupport, context);
     }
 
+
+    public static void main(String[] args) {
+
+        System.out.println(   StrUtil.removeAllLineBreaks(PinyinUtil.getPinyin("张三","")));
+
+    }
+
 }
\ No newline at end of file

common-lib/src/main/java/com/mortals/xhx/feign/device/IDeviceFeign.java

+package com.mortals.xhx.feign.device;
+
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.device.DevicePdu;
+import com.mortals.xhx.feign.IFeign;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+/**
+ * 设备 Feign接口
+ * @author zxfei
+ * @date 2022-10-26
+ */
+@FeignClient(name = "device-manager", path = "/m", fallbackFactory = DeviceFeignFallbackFactory.class)
+public interface IDeviceFeign extends IFeign {
+
+
+    /**
+     * 查看设备列表
+     *
+     * @param devicePdu
+     * @return
+     */
+    @PostMapping(value = "/device/list")
+    Rest<RespData<List<DevicePdu>>> list(@RequestBody DevicePdu devicePdu);
+
+
+    /**
+     * 查看设备
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/device/info")
+    Rest<DevicePdu> info(@RequestParam(value = "id") Long id);
+
+    /**
+     * 删除设备
+     *
+     * @param ids
+     * @return
+     */
+    @GetMapping(value = "/device/delete")
+    Rest<Void> delete(Long[] ids,@RequestHeader("Authorization") String authorization);
+
+
+    /**
+     * 设备保存更新
+     *
+     * @param devicePdu
+     * @return
+     */
+    @PostMapping(value = "/device/save")
+    Rest<RespData<DevicePdu>> save(@RequestBody DevicePdu devicePdu,@RequestHeader("Authorization") String authorization);
+
+
+    /**
+     * 站点变更设备通知
+     *
+     * @param devicePdu
+     * @return
+     */
+    @PostMapping(value = "/notify/refreshMessage")
+    Rest<Void> refreshMessage(@RequestBody DevicePdu devicePdu);
+
+
+}
+
+
+@Slf4j
+@Component
+class DeviceFeignFallbackFactory implements FallbackFactory<IDeviceFeign> {
+    @Override
+    public IDeviceFeign create(Throwable t) {
+        return new IDeviceFeign() {
+            @Override
+            public Rest<RespData<List<DevicePdu>>> list(DevicePdu devicePdu) {
+               return Rest.fail("暂时无法获取设备列表，请稍后再试!");
+            }
+
+            @Override
+            public Rest<DevicePdu> info(Long id) {
+               return Rest.fail("暂时无法获取设备详细，请稍后再试!");
+            }
+
+            @Override
+            public Rest<Void> delete(Long[] ids, String authorization) {
+                return Rest.fail("暂时无法删除设备，请稍后再试!");
+            }
+
+            @Override
+            public Rest<RespData<DevicePdu>> save(DevicePdu devicePdu, String authorization) {
+                return Rest.fail("暂时无法保存设备，请稍后再试!");
+            }
+
+            /**
+             * @param devicePdu
+             * @return
+             */
+            @Override
+            public Rest<Void> refreshMessage(DevicePdu devicePdu) {
+                return Rest.fail("暂时无法通知设备，请稍后再试!");
+            }
+        };
+    }
+}
+
+
+
+
+
+
+
+

portal-manager/src/main/bin/check_server.sh

+#!/bin/bash
+PORT="@profiles.server.port@"
+PROJECT_NAME="@project.artifactId@";
+MAIN_CLASS="$PROJECT_NAME-@project.version@.jar";
+SHELL_NAME=$0
+SHELL_LOG="${SHELL_NAME}.log"
+
+LOG_DATE='date "+%Y-%m-%d"'
+LOG_TIME='date "+%H-%M-%S"'
+
+CDATE=$(date "+%Y-%m-%d")
+CTIME=$(date "+%H-%M-%S")
+
+#写日志
+writelog() {
+  LOGINFO=$1
+  echo "${CDATE} ${CTIME}: ${SHELL_NAME} : ${LOGINFO}" >>${SHELL_LOG}
+}
+jcpid=`ps -ef | grep -v "grep" | grep "$MAIN_CLASS" | grep "app.port=$PORT" | sed -n '1P' | awk '{print $2}'`
+
+if [ $jcpid ]; then
+		writelog "The $PROJECT_NAME start finished, PID is $jcpid"
+		exit $SUCCESS
+	else
+    writelog "start service..."
+    systemctl stop ${PROJECT_NAME} && systemctl start ${PROJECT_NAME}
+fi
+

smart-gateway/src/main/bin/check_server.sh

+#!/bin/bash
+PORT="@profiles.server.port@"
+PROJECT_NAME="@project.artifactId@";
+MAIN_CLASS="$PROJECT_NAME-@project.version@.jar";
+SHELL_NAME=$0
+SHELL_LOG="${SHELL_NAME}.log"
+
+LOG_DATE='date "+%Y-%m-%d"'
+LOG_TIME='date "+%H-%M-%S"'
+
+CDATE=$(date "+%Y-%m-%d")
+CTIME=$(date "+%H-%M-%S")
+
+#写日志
+writelog() {
+  LOGINFO=$1
+  echo "${CDATE} ${CTIME}: ${SHELL_NAME} : ${LOGINFO}" >>${SHELL_LOG}
+}
+jcpid=`ps -ef | grep -v "grep" | grep "$MAIN_CLASS" | grep "app.port=$PORT" | sed -n '1P' | awk '{print $2}'`
+
+if [ $jcpid ]; then
+		writelog "The $PROJECT_NAME start finished, PID is $jcpid"
+		exit $SUCCESS
+	else
+    writelog "start service..."
+    systemctl stop ${PROJECT_NAME} && systemctl start ${PROJECT_NAME}
+fi
+