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

base-manager/db/params.sql

@@ -369,3 +369,6 @@ INSERT INTO `mortals_xhx_product` VALUES (null, '样表机', 'ybj', '样表机',
 INSERT INTO `mortals_sys_model` VALUES (null, '基础设置平台', 'basic setting ', 'file/fileupload/1672810627756.svg', 'http://192.168.0.98:11071/#/jump', '基础设置平台-test', 1, '2022-04-20 09:55:59', 1, '2023-01-04 13:37:09');
 
 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);
\ No newline at end of file

base-manager/pom.xml

@@ -58,7 +58,7 @@
                 <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
                 <profiles.log.level>INFO</profiles.log.level>
                 <package.environment>test</package.environment>
-                <skipUi>true</skipUi>
+                <skipUi>false</skipUi>
             </properties>
         </profile>
 

base-manager/src/main/java/com/mortals/xhx/base/framework/aspect/WebLogAspect.java

@@ -37,8 +37,8 @@ import java.util.Map;
  * @author: zxfei
  * @date: 2022/4/20 9:24
  */
-@Aspect
-@Component
+//@Aspect
+//@Component
 @Slf4j
 //@Order(1)
 @Profile({"default", "develop", "test"})

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

@@ -34,15 +34,18 @@ import com.mortals.xhx.module.model.service.ModelService;
 import com.mortals.xhx.module.site.dao.SiteDao;
 import com.mortals.xhx.module.site.model.*;
 import com.mortals.xhx.module.site.model.vo.SiteAreaVo;
-import com.mortals.xhx.module.site.service.SiteBusinessService;
-import com.mortals.xhx.module.site.service.SiteService;
+import com.mortals.xhx.module.site.service.*;
 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 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.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
@@ -82,11 +85,20 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
 
     @Autowired
     private MatterService matterService;
-
     @Autowired
     private WindowService windowService;
     @Autowired
     private SiteBusinessService siteBusinessService;
+    @Autowired
+    private SiteThemeMatterService siteThemeMatterService;
+    @Autowired
+    private SiteMatterService siteMatterService;
+
+
+    @Autowired
+    private WorkmanService workmanService;
+
+
 
 
     @Override
@@ -95,18 +107,39 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         SiteEntity siteEntity = this.get(entity.getId(), context);
         if(!siteEntity.getSiteName().equals(entity.getSiteName())){
             //todo
+            //更新关联站点名称
+            updateAssociateSiteName(entity, context);
+
+            //通知设备更新站点信息
+
         }
-        //更新窗口名称
+        super.updateBefore(entity, context);
+    }
+
+    private void updateAssociateSiteName(SiteEntity entity, Context context) {
         List<WindowEntity> windowEntityList = windowService.find(new WindowQuery().siteId(entity.getId()));
         windowEntityList.forEach(item->item.setSiteName(entity.getSiteName()));
-        windowService.update(windowEntityList,context);
+        windowService.update(windowEntityList, context);
 
         //更新站点业务名称
         List<SiteBusinessEntity> siteBusinessEntities = siteBusinessService.find(new SiteBusinessQuery().siteId(entity.getId()));
         siteBusinessEntities.forEach(item->item.setSiteName(entity.getSiteName()));
-        siteBusinessService.update(siteBusinessEntities,context);
-
-        super.updateBefore(entity, context);
+        siteBusinessService.update(siteBusinessEntities, context);
+
+        //更新站点主题事项名称
+        List<SiteMatterEntity> siteMatterEntities = siteMatterService.find(new SiteMatterQuery().siteId(entity.getId()));
+        siteMatterEntities.forEach(item->item.setSiteName(entity.getSiteName()));
+        siteMatterService.update(siteMatterEntities, context);
+
+        //更新站点主题事项名称
+        List<SiteThemeMatterEntity> siteThemeMatterEntities = siteThemeMatterService.find(new SiteThemeMatterQuery().siteId(entity.getId()));
+        siteThemeMatterEntities.forEach(item->item.setSiteName(entity.getSiteName()));
+        siteThemeMatterService.update(siteThemeMatterEntities, context);
+
+        //更新工作人员站点
+        List<WorkmanEntity> workmanEntities = workmanService.find(new WorkmanQuery().siteId(entity.getId()));
+        workmanEntities.forEach(item->item.setSiteName(entity.getSiteName()));
+        workmanService.update(workmanEntities, context);
     }
 
     @Override

base-manager/src/main/java/com/mortals/xhx/module/window/model/vo/WindowBusinessVo.java

@@ -25,4 +25,7 @@ public class WindowBusinessVo extends BaseEntityLong {
      */
     private String fromnum;
 
+    /** 窗口id列表 */
+    private List <Long> windowIdList;
+
 }
\ No newline at end of file

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

@@ -110,6 +110,7 @@ public class WorkmanEntity extends WorkmanVo {
     /**
      * 照片
      */
+    @Excel(name = "照片",height = 90, type = Excel.Type.EXPORT, cellType = Excel.ColumnType.IMAGE)
     private String photoPath;
     /**
      * 岗位职责

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

 package com.mortals.xhx.module.workman.model.vo;
 
+import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import lombok.Data;
+import org.apache.poi.ss.usermodel.PictureData;
 import org.springframework.web.bind.annotation.RequestParam;
 
 /**
@@ -14,4 +16,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 public class WorkmanVo extends BaseEntityLong {
     private String oldPwd;
     private String newPwd;
+
+    /**
+     * 证件图片附件
+     */
+    @Excel(name = "证件图片", type = Excel.Type.IMPORT, cellType = Excel.ColumnType.IMAGE)
+    private PictureData picObj;
 }
\ 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 com.mortals.framework.common.code.UserType;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
-import com.mortals.framework.model.PageInfo;
-import com.mortals.framework.service.IUser;
 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.role.model.RoleUserQuery;
-import com.mortals.xhx.base.system.role.service.RoleUserService;
-import com.mortals.xhx.base.system.user.model.UserEntity;
-import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
+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 org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
-import com.mortals.xhx.module.workman.dao.WorkmanDao;
-import com.mortals.xhx.module.workman.model.WorkmanEntity;
-import com.mortals.xhx.module.workman.service.WorkmanService;
-import org.springframework.util.ObjectUtils;
 
-import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 
 /**

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

@@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.util.DateUtils;
+import com.mortals.framework.util.FileUtil;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.framework.annotation.Operlog;
@@ -14,12 +16,19 @@ import com.mortals.xhx.base.system.role.model.RoleUserEntity;
 import com.mortals.xhx.base.system.role.model.RoleUserQuery;
 import com.mortals.xhx.base.system.role.service.RoleService;
 import com.mortals.xhx.base.system.role.service.RoleUserService;
+import com.mortals.xhx.base.system.upload.service.UploadService;
 import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.code.OnlineEnum;
+import com.mortals.xhx.module.dept.model.DeptEntity;
+import com.mortals.xhx.module.dept.service.DeptService;
 import com.mortals.xhx.module.model.model.ModelQuery;
 import com.mortals.xhx.module.model.service.ModelService;
+import com.mortals.xhx.module.site.model.SiteEntity;
+import com.mortals.xhx.module.site.service.SiteService;
+import com.mortals.xhx.module.window.model.WindowEntity;
+import com.mortals.xhx.module.window.service.WindowService;
 import com.mortals.xhx.module.workman.model.WorkmanEntity;
 import com.mortals.xhx.module.workman.model.WorkmanQuery;
 import com.mortals.xhx.module.workman.service.WorkmanService;
@@ -28,6 +37,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
+import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -44,6 +56,16 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
 
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private SiteService siteService;
+    @Autowired
+    private DeptService deptService;
+    @Autowired
+    private WindowService windowService;
+    @Autowired
+    private UploadService uploadService;
+
+
 
     public WorkmanController() {
         super.setModuleDesc("工作人员");
@@ -69,10 +91,10 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
         JSONObject ret = new JSONObject();
         try {
             String ip = super.getRequestIP(request);
-            WorkmanEntity workmanEntity = this.service.doLogin(query.getLoginName(), query.getLoginPwd(),ip);
-           if(query.getSiteId()!=workmanEntity.getSiteId()){
-               throw new AppException("当前工作人员不在当前站点下！");
-           }
+            WorkmanEntity workmanEntity = this.service.doLogin(query.getLoginName(), query.getLoginPwd(), ip);
+            if (query.getSiteId() != workmanEntity.getSiteId()) {
+                throw new AppException("当前工作人员不在当前站点下！");
+            }
             ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
             ret.put(KEY_RESULT_MSG, "工作人员登录成功！");
             ret.put(KEY_RESULT_DATA, workmanEntity);
@@ -105,4 +127,64 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
         }
         return ret.toJSONString();
     }
+
+
+    /**
+     * @param list
+     * @param updateSupport
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    public void doImportDataBefore(List<WorkmanEntity> list, boolean updateSupport, Context context) throws AppException {
+        String siteId = request.getParameter("siteId");
+        String deptId = request.getParameter("deptId");
+        String windowId = request.getParameter("windowId");
+
+        log.info("siteId:{},deptId:{},windowId:{},", siteId, deptId, windowId);
+        SiteEntity siteEntity = null;
+        DeptEntity deptEntity = null;
+        WindowEntity windowEntity = null;
+        if (!ObjectUtils.isEmpty(siteId)) {
+            siteEntity = siteService.get(Long.parseLong(siteId));
+        }
+        if (!ObjectUtils.isEmpty(deptId)) {
+            deptEntity = deptService.get(Long.parseLong(deptId));
+        }
+        if (!ObjectUtils.isEmpty(windowId)) {
+            windowEntity = windowService.get(Long.parseLong(windowId));
+        }
+
+        for (WorkmanEntity workmanEntity : list) {
+            if (!ObjectUtils.isEmpty(siteEntity)) {
+                workmanEntity.setSiteId(siteEntity.getId());
+                workmanEntity.setSiteName(siteEntity.getSiteName());
+            }
+            if (!ObjectUtils.isEmpty(deptEntity)) {
+                workmanEntity.setDeptId(deptEntity.getId());
+                workmanEntity.setDeptName(deptEntity.getName());
+            }
+            if (!ObjectUtils.isEmpty(windowEntity)) {
+                workmanEntity.setWindowId(windowEntity.getId());
+                workmanEntity.setWindowName(windowEntity.getName());
+            }
+
+            if (!ObjectUtils.isEmpty(workmanEntity.getPicObj())) {
+                String extension = workmanEntity.getPicObj().suggestFileExtension();
+                String newName = "/file/uploadfile/" + new Date().getTime() + "." + extension;
+                String filePath = uploadService.getFilePath(newName);
+                try {
+                    boolean bool = FileUtil.write(filePath, workmanEntity.getPicObj().getData(), true, true);
+                    if (bool) {
+                        workmanEntity.setPhotoPath(newName);
+                    }
+                } catch (IOException e) {
+                    log.error("写入证照异常",e);
+                }
+            }
+        }
+
+        super.doImportDataBefore(list, updateSupport, context);
+    }
+
 }
\ No newline at end of file

base-manager/src/test/java/com/mortals/httpclient/http-client.env.json

@@ -11,5 +11,7 @@
   "base-test1": {
     "baseUrl": "http://192.168.0.98:17211/base"
   },
-
+  "base-yibintest": {
+    "baseUrl": "http://192.168.2.169:11078/base"
+  }
 }
\ No newline at end of file

base-manager/src/test/java/com/mortals/httpclient/window/WindowBusinessController.http

@@ -4,7 +4,7 @@ POST {{baseUrl}}/window/business/list
 Content-Type: application/json
 
 {
-    "siteBusinessId":3,
+    "windowIdList":[3,4,5],
     "page":1,
     "size":10
 }

base-manager/src/test/java/com/mortals/httpclient/window/WindowController.http

@@ -4,7 +4,7 @@ POST {{baseUrl}}/window/list
 Content-Type: application/json
 
 {
-  "siteId":8,
+   "siteId":8,
     "page":1,
     "size":10
 }