Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into feature-wcz

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/controller/ScanRecordController.java

@@ -1,6 +1,8 @@
 package cn.com.ty.lift.business.maintenance.controller;
 
 import cn.com.ty.lift.business.framework.util.MessageUtils;
+import cn.com.ty.lift.business.library.dao.entity.model.request.LiftRequest;
+import cn.com.ty.lift.business.library.service.LiftService;
 import cn.com.ty.lift.business.maintenance.dao.entity.MaintenanceRecord;
 import cn.com.ty.lift.business.maintenance.dao.entity.ScanRecord;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceRecordRequest;
@@ -30,6 +32,22 @@ public class ScanRecordController {
     private final MaintenanceRecordMapper maintenanceRecordMapper;
     private final MaintenanceRecordService maintenanceRecordService;
     private final ScanRecordService scanRecordService;
+    private final LiftService liftService;
+
+    /**
+     * 根据电梯id查询电梯信息
+     *
+     * @param request id
+     * @return 电梯信息
+     */
+    @PostMapping("lift/detail")
+    public RestResponse detail(@RequestBody LiftRequest request) {
+        Object response = liftService.detail(request.getLiftId(), null);
+        if (ObjectUtil.isEmpty(response)) {
+            return RestResponse.success();
+        }
+        return RestResponse.success(response, MessageUtils.get("msg.query.detail.success"));
+    }
 
     /**
      * 根据电梯id查询已完成的维保记录

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/request/MaintenanceRecordRequest.java

@@ -43,7 +43,7 @@ public class MaintenanceRecordRequest extends PageRequest {
      */
     @NotNull(message = "用户ID不能为空")
     @Min(value = 1, message = "用户ID有误")
-    private Long workerId;
+    private Long userId;
 
     /**
      * 维保计划状态
@@ -57,11 +57,22 @@ public class MaintenanceRecordRequest extends PageRequest {
     @NotBlank(message = "维保工经纬度不能为空")
     private String coordinate;
 
+    /**
+     * 当前日期
+     */
+    @NotNull(message = "当前日期不能为空")
+    private LocalDate currentTime;
+
     /**
      * 开始日期
      */
     @NotNull(message = "开始日期不能为空")
-    private LocalDate currentTime;
+    private LocalDate beginTime;
+
+    /**
+     * 当前用户角色
+     */
+    private String currentRoleCode;
 
     /**
      * 结束日期

lift-business-service/src/main/java/cn/com/ty/lift/business/project/controller/ProjectAppController.java

@@ -7,6 +7,7 @@ import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.library.dao.entity.model.request.LiftExtensionRequest;
 import cn.com.ty.lift.business.maintenance.dao.entity.MaintenanceRecord;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceRecordRequest;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenanceAppResponse;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenanceRecordResponse;
 import cn.com.ty.lift.business.maintenance.service.MaintenanceRecordService;
 import cn.com.ty.lift.business.project.dao.entity.model.ProjectAppUser;
@@ -176,15 +177,28 @@ public class ProjectAppController {
     }
 
     /**
-     * @param request 用户id和维保状态
+     * @param request 用户ID、公司ID
+     * @return RestResponse 统计保养数
+     * @description 根据用户ID和公司ID统计保养数
+     * @date 2020/1/6 11:29 上午
+     */
+    @PostMapping("maintenance/count")
+    @Validation(fields = {"mtCompanyId", "userId", "beginTime"})
+    public RestResponse count(@Val @RequestBody MaintenanceRecordRequest request) {
+        Map<String, Long> result = projectAppService.count(request);
+        return RestResponse.success(result, MessageUtils.get("msg.query.success"));
+    }
+
+    /**
+     * @param request 用户ID和维保状态
      * @return RestResponse 保养任务列表
-     * @description 根据用户id和维保状态查询维保计划任务列表
+     * @description 根据用户ID和维保状态查询维保计划任务列表
      * @date 2020/1/6 11:29 上午
      */
     @PostMapping("maintenance/planTask")
-    @Validation(fields = {"mtCompanyId", "workerId", "status", "currentTime"})
+    @Validation(fields = {"mtCompanyId", "userId", "status"})
     public RestResponse planTask(@Val @RequestBody MaintenanceRecordRequest request) {
-        Map<String, Object> result = projectAppService.planTask(request);
+        IPage<MaintenanceAppResponse> result = projectAppService.planTask(request);
         return RestResponse.success(result, MessageUtils.get("msg.query.success"));
     }
 
@@ -195,9 +209,9 @@ public class ProjectAppController {
      * @date 2020/4/24 5:03 下午
      */
     @PostMapping("maintenance/recordTask")
-    @Validation(fields = {"mtCompanyId", "workerId", "status", "currentTime"})
+    @Validation(fields = {"mtCompanyId", "userId", "status"})
     public RestResponse recordTask(@Val @RequestBody MaintenanceRecordRequest request) {
-        Map<String, Object> result = projectAppService.recordTask(request);
+        IPage<MaintenanceAppResponse> result = projectAppService.recordTask(request);
         return RestResponse.success(result, MessageUtils.get("msg.query.success"));
     }
 

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectAppService.java

@@ -19,6 +19,7 @@ import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectLiftResp
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectUserResponse;
 import cn.com.ty.lift.business.project.dao.mapper.ProjectMapper;
 import cn.com.ty.lift.business.project.dao.mapper.ProjectUserMapper;
+import cn.com.ty.lift.common.constants.CommonEnum;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -120,32 +121,60 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
         return baseMapper.findProjectById(request);
     }
 
+    /**
+     * @param request 用户ID，公司ID
+     * @return Map<String, Long> 统计分组结果
+     * @description 保养任务日历统计
+     * @date 2020/4/30 2:15 下午
+     */
+    public Map<String, Long> count(MaintenanceRecordRequest request) {
+        request.setEndTime(request.getBeginTime().with(TemporalAdjusters.lastDayOfMonth()));
+        //总经理查询所有保养任务
+        if (DefaultRole.HIGH_DIRECTOR.getCode().equals(request.getCurrentRoleCode())) {
+            request.setUserId(null);
+        }
+        List<MaintenanceAppResponse> planCountResult = maintenancePlanMapper.countPlanByWorkerId(request);
+        //统计待保养、超期的任务
+        Map<String, Long> planCollect = planCountResult.stream().collect(Collectors.groupingBy(MaintenanceAppResponse::getStatus, Collectors.counting()));
+
+        Long waitingMaintenance = planCollect.get(MaintenancePlanStatus.WAITING_MAINTENANCE.getCode());
+        Long overdue = planCollect.get(MaintenancePlanStatus.OVERDUE.getCode());
+
+        List<MaintenanceAppResponse> recordCountResult = maintenanceRecordMapper.countRecordByWorkerId(request);
+        //统计保养中、保养完成任务
+        Map<String, Long> recordCollect = recordCountResult.stream().collect(Collectors.groupingBy(MaintenanceAppResponse::getStatus, Collectors.counting()));
+
+        Long inProgress = recordCollect.get(MaintenanceRecordStatus.MAINTENANCE_DOING.getCode());
+        Long complete = recordCollect.get(MaintenanceRecordStatus.COMPLETE.getCode());
+
+        Map<String, Long> countMap = new HashMap<>();
+        countMap.put("inProgress", inProgress == null ? 0 : inProgress);
+        countMap.put("complete", complete == null ? 0 : complete);
+        countMap.put("overdue", overdue == null ? 0 : overdue);
+        countMap.put("waitingMaintenance", waitingMaintenance == null ? 0 : waitingMaintenance);
+        return countMap;
+    }
+
     /**
      * @param request 用户id和维保状态
      * @return RestResponse 保养任务列表 （待完成、超期）
      * @description 根据用户id和维保状态查询保养任务列表
      * @date 2020/1/6 11:29 上午
      */
-    public Map<String, Object> planTask(MaintenanceRecordRequest request) {
-        Map<String, Object> resultMap = new HashMap<>();
-        Map<String, Long> countMap = new HashMap<>();
-        request.setEndTime(request.getCurrentTime().with(TemporalAdjusters.lastDayOfMonth()));
+    public IPage<MaintenanceAppResponse> planTask(MaintenanceRecordRequest request) {
+        if (Objects.nonNull(request.getBeginTime())) {
+            request.setEndTime(request.getBeginTime().with(TemporalAdjusters.lastDayOfMonth()));
+        }
+        //总经理查询所有保养任务
+        if (DefaultRole.HIGH_DIRECTOR.getCode().equals(request.getCurrentRoleCode())) {
+            request.setUserId(null);
+        }
         IPage<MaintenanceAppResponse> page = maintenancePlanMapper.findPlanByWorkerId(request.getPage(), request);
-
         List<MaintenanceAppResponse> records = page.getRecords();
         if (CollUtil.isNotEmpty(records)) {
-            List<MaintenanceAppResponse> countResult = maintenancePlanMapper.countPlanByWorkerId(request);
-
-            //统计待保养、超期的任务
-            Map<String, Long> collect = countResult.stream().collect(Collectors.groupingBy(MaintenanceAppResponse::getStatus, Collectors.counting()));
-
-            Long waitingMaintenance = collect.get(MaintenancePlanStatus.WAITING_MAINTENANCE.getCode());
-            Long overdue = collect.get(MaintenancePlanStatus.OVERDUE.getCode());
-            countMap.put("overdue", overdue == null ? 0 : overdue);
-            countMap.put("waitingMaintenance", waitingMaintenance == null ? 0 : waitingMaintenance);
 
             Map<Long, List<MaintenanceAppResponse>> currentTaskMap = page.getRecords().stream().filter(entry ->
-                    Objects.equals(request.getWorkerId(), entry.getWorkerId())).collect(Collectors.groupingBy(MaintenanceAppResponse::getLiftId));
+                    Objects.equals(request.getUserId(), entry.getWorkerId())).collect(Collectors.groupingBy(MaintenanceAppResponse::getLiftId));
             List<MaintenanceAppResponse> taskList = new ArrayList<>();
             for (Map.Entry<Long, List<MaintenanceAppResponse>> entry : currentTaskMap.entrySet()) {
                 taskList.addAll(entry.getValue());
@@ -155,7 +184,7 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
                     .sorted(Comparator.comparing(MaintenanceAppResponse::getPlanDate)).collect(Collectors.toCollection(LinkedList::new));
 
             Map<Long, List<MaintenanceAppResponse>> taskMap = page.getRecords().stream().filter(entry ->
-                    !Objects.equals(request.getWorkerId(), entry.getWorkerId())).collect(Collectors.groupingBy(MaintenanceAppResponse::getLiftId));
+                    !Objects.equals(request.getUserId(), entry.getWorkerId())).collect(Collectors.groupingBy(MaintenanceAppResponse::getLiftId));
 
             taskList.clear();
             for (Map.Entry<Long, List<MaintenanceAppResponse>> entry : taskMap.entrySet()) {
@@ -167,9 +196,7 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
 
             page.setRecords(currentUserTaskList);
         }
-        resultMap.put("pageResult", page);
-        resultMap.put("count", countMap);
-        return resultMap;
+        return page;
     }
 
     /**
@@ -178,24 +205,19 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
      * @description 根据用户id和z维保状态查询保养任务列表
      * @date 2020/4/24 5:03 下午
      */
-    public Map<String, Object> recordTask(MaintenanceRecordRequest request) {
-        Map<String, Object> resultMap = new HashMap<>();
-        Map<String, Long> countMap = new HashMap<>();
-        request.setEndTime(request.getCurrentTime().with(TemporalAdjusters.lastDayOfMonth()));
+    public IPage<MaintenanceAppResponse> recordTask(MaintenanceRecordRequest request) {
+        if (Objects.nonNull(request.getBeginTime())) {
+            request.setEndTime(request.getBeginTime().with(TemporalAdjusters.lastDayOfMonth()));
+        }
+        //总经理查询所有保养任务
+        if (DefaultRole.HIGH_DIRECTOR.getCode().equals(request.getCurrentRoleCode())) {
+            request.setUserId(null);
+        }
         IPage<MaintenanceAppResponse> page = maintenanceRecordMapper.findRecordByWorkerId(request.getPage(), request);
         List<MaintenanceAppResponse> records = page.getRecords();
         if (CollUtil.isNotEmpty(records)) {
-            List<MaintenanceAppResponse> countResult = maintenanceRecordMapper.countRecordByWorkerId(request);
-            //统计保养中、保养完成任务
-            Map<String, Long> collect = countResult.stream().collect(Collectors.groupingBy(MaintenanceAppResponse::getStatus, Collectors.counting()));
-
-            Long inProgress = collect.get(MaintenanceRecordStatus.MAINTENANCE_DOING.getCode());
-            Long complete = collect.get(MaintenanceRecordStatus.COMPLETE.getCode());
-            countMap.put("inProgress", inProgress == null ? 0 : inProgress);
-            countMap.put("complete", complete == null ? 0 : complete);
-
             Map<Long, List<MaintenanceAppResponse>> currentTaskMap = page.getRecords().stream().filter(entry ->
-                    Objects.equals(request.getWorkerId(), entry.getWorkerId1())).collect(Collectors.groupingBy(MaintenanceAppResponse::getLiftId));
+                    Objects.equals(request.getUserId(), entry.getWorkerId1())).collect(Collectors.groupingBy(MaintenanceAppResponse::getLiftId));
             List<MaintenanceAppResponse> taskList = new ArrayList<>();
             for (Map.Entry<Long, List<MaintenanceAppResponse>> entry : currentTaskMap.entrySet()) {
                 taskList.addAll(entry.getValue());
@@ -204,7 +226,7 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
                     .sorted(Comparator.comparing(MaintenanceAppResponse::getPlanDate).reversed()).collect(Collectors.toCollection(LinkedList::new));
 
             Map<Long, List<MaintenanceAppResponse>> taskMap = page.getRecords().stream().filter(entry ->
-                    !Objects.equals(request.getWorkerId(), entry.getWorkerId1())).collect(Collectors.groupingBy(MaintenanceAppResponse::getLiftId));
+                    !Objects.equals(request.getUserId(), entry.getWorkerId1())).collect(Collectors.groupingBy(MaintenanceAppResponse::getLiftId));
 
             taskList.clear();
             for (Map.Entry<Long, List<MaintenanceAppResponse>> entry : taskMap.entrySet()) {
@@ -216,9 +238,7 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
 
             page.setRecords(currentUserTaskList);
         }
-        resultMap.put("pageResult", page);
-        resultMap.put("count", countMap);
-        return resultMap;
+        return page;
     }
 
     /**

lift-business-service/src/main/resources/mapper/maintenance/MaintenancePlanMapper.xml

@@ -127,17 +127,20 @@
 				 LEFT JOIN lift l ON mp.lift_id = l.id
 				 LEFT JOIN user_info ui ON mp.worker_id = ui.user_id
 		WHERE mp.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
-		<if test="request.workerId!=null and request.workerId!=''">
-			AND pu.user_id = #{request.workerId,jdbcType=BIGINT}
+		<if test="request.userId!=null">
+			AND pu.user_id = #{request.userId,jdbcType=BIGINT}
 		</if>
 		<if test="request.status!=null and request.status!=''">
 			AND mp.status = #{request.status,jdbcType=VARCHAR}
 		</if>
 		<if test="request.currentTime!=null">
-			AND <![CDATA[ mp.plan_date >= #{request.currentTime}]]>
+			AND <![CDATA[ mp.plan_date = #{request.currentTime}]]>
+		</if>
+		<if test="request.beginTime!=null">
+			AND <![CDATA[ mp.plan_date >= #{request.beginTime}]]>
 		</if>
 		<if test="request.endTime!=null">
-			AND <![CDATA[ mp.plan_date <= #{request.endTime,jdbcType=VARCHAR}]]>
+			AND <![CDATA[ mp.plan_date <= #{request.endTime}]]>
 		</if>
 	</select>
 
@@ -151,14 +154,14 @@
 		LEFT JOIN lift l ON mp.lift_id = l.id
 		LEFT JOIN user_info ui ON mp.worker_id = ui.user_id
 		WHERE mp.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
-		<if test="request.workerId!=null and request.workerId!=''">
-			AND pu.user_id = #{request.workerId,jdbcType=BIGINT}
+		<if test="request.userId!=null">
+			AND pu.user_id = #{request.userId,jdbcType=BIGINT}
 		</if>
-		<if test="request.currentTime!=null">
-			AND <![CDATA[ mp.plan_date >= #{request.currentTime}]]>
+		<if test="request.beginTime!=null">
+			AND <![CDATA[ mp.plan_date >= #{request.beginTime}]]>
 		</if>
 		<if test="request.endTime!=null">
-			AND <![CDATA[ mp.plan_date <= #{request.endTime,jdbcType=VARCHAR}]]>
+			AND <![CDATA[ mp.plan_date <= #{request.endTime}]]>
 		</if>
 	</select>
 

lift-business-service/src/main/resources/mapper/maintenance/MaintenanceRecordMapper.xml

@@ -123,17 +123,20 @@
 		LEFT JOIN lift l ON mr.lift_id = l.id
 		LEFT JOIN user_info ui ON mr.worker_id = ui.user_id
 		WHERE mr.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
-		<if test="request.workerId!=null and request.workerId!=''">
-			AND mr.worker_id1 = #{request.workerId,jdbcType=BIGINT}
+		<if test="request.userId!=null">
+			AND mr.worker_id1 = #{request.userId,jdbcType=BIGINT}
 		</if>
 		<if test="request.status!=null and request.status!=''">
 			AND mr.status = #{request.status,jdbcType=VARCHAR}
 		</if>
         <if test="request.currentTime!=null">
-            AND <![CDATA[ mr.plan_date >= #{request.currentTime}]]>
+            AND <![CDATA[ mr.plan_date = #{request.currentTime}]]>
+        </if>
+        <if test="request.beginTime!=null">
+            AND <![CDATA[ mr.plan_date >= #{request.beginTime}]]>
         </if>
         <if test="request.endTime!=null">
-            AND <![CDATA[ mr.plan_date <= #{request.endTime,jdbcType=VARCHAR}]]>
+            AND <![CDATA[ mr.plan_date <= #{request.endTime}]]>
         </if>
 	</select>
 
@@ -146,14 +149,14 @@
                 LEFT JOIN lift l ON mr.lift_id = l.id
                 LEFT JOIN user_info ui ON mr.worker_id = ui.user_id
         WHERE mr.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
-        <if test="request.workerId!=null and request.workerId!=''">
-            AND mr.worker_id1 = #{request.workerId,jdbcType=BIGINT}
+        <if test="request.userId!=null">
+            AND mr.worker_id1 = #{request.userId,jdbcType=BIGINT}
         </if>
-        <if test="request.currentTime!=null">
-            AND <![CDATA[ mr.plan_date >= #{request.currentTime}]]>
+        <if test="request.beginTime!=null">
+            AND <![CDATA[ mr.plan_date >= #{request.beginTime}]]>
         </if>
         <if test="request.endTime!=null">
-            AND <![CDATA[ mr.plan_date <= #{request.endTime,jdbcType=VARCHAR}]]>
+            AND <![CDATA[ mr.plan_date <= #{request.endTime}]]>
         </if>
     </select>
 

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/controller/RegionController.java

@@ -2,6 +2,7 @@ package cn.com.ty.lift.enterprise.region.controller;
 
 import cn.com.ty.lift.enterprise.region.dao.entity.Region;
 import cn.com.ty.lift.enterprise.region.dao.entity.model.RegionReq;
+import cn.com.ty.lift.enterprise.region.dao.mapper.RegionMapper;
 import cn.com.ty.lift.enterprise.region.service.RegionService;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -26,7 +27,8 @@ import java.util.Map;
 @RestController
 @RequestMapping("/region")
 public class RegionController {
-    private RegionService regionService;
+    private final RegionService regionService;
+    private final RegionMapper regionMapper;
 
     @PostMapping("/list")
     public RestResponse list(@RequestBody RegionReq regionReq) {
@@ -70,6 +72,14 @@ public class RegionController {
      */
     @PostMapping("/update")
     public RestResponse update(@RequestBody Region region) {
+        Region byId = regionService.getById(region);
+        //如果区域主管更改了，发推送消息
+        if (!byId.getUserId().equals(region.getUserId())) {
+            String oldUser = regionMapper.selectNameByUserId(byId.getUserId());
+            String newUser = regionMapper.selectNameByUserId(region.getUserId());
+            String areaName = byId.getAreaName();
+            regionService.push(areaName, oldUser, newUser, byId, region);
+        }
         if (regionService.updateById(region)) {
             return RestResponse.success(null, "成功");
         }
@@ -104,7 +114,7 @@ public class RegionController {
      *
      * @param region 区域id
      * @return RestResponse
-     * @since  2019/12/17 10:34
+     * @since 2019/12/17 10:34
      */
     @PostMapping("/project/areas")
     public RestResponse areas(@RequestBody Region region) {
@@ -122,6 +132,7 @@ public class RegionController {
 
     /**
      * 区域属于的省市名，省市编码
+     *
      * @param region 区域id
      * @return RestResponse
      * @since 2019/12/19 15:15
@@ -133,6 +144,7 @@ public class RegionController {
 
     /**
      * 项目模块，根据regionId查询区域主管，区域文员
+     *
      * @param region 区域id
      * @return RestResponse 查询区域主管，区域文员
      * @since 2019/12/17 10:33

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/dao/mapper/RegionMapper.java

@@ -22,7 +22,7 @@ public interface RegionMapper extends BaseMapper<Region> {
     List<Map<String, Object>> selectProjectRegions(@Param("id") Long id);
 
     @Select("select user_id userId,name from user_info")
-    List<Map<String,Object>> selectUserInfo();
+    List<Map<String, Object>> selectUserInfo();
 
     @Select("select region_id regionId,num from project")
     List<Map<String, Object>> selectProjects();
@@ -38,4 +38,7 @@ public interface RegionMapper extends BaseMapper<Region> {
 
     @Select("select name,code from area_code where parent=#{cityCode}")
     List<Map<String, Object>> areas(String cityCode);
+
+    @Select("select name from user_info where user_id = #{userId}")
+    String selectNameByUserId(Long userId);
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/service/RegionService.java

@@ -27,4 +27,6 @@ public interface RegionService extends IService<Region> {
     RestResponse selectRegionUser(Region region);
 
     List<Map<String, Object>> areas(String cityCode);
+
+    void push(String areaName, String oldUser, String newUser, Region byId, Region region);
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/service/impl/RegionServiceImpl.java

@@ -1,5 +1,8 @@
 package cn.com.ty.lift.enterprise.region.service.impl;
 
+import cn.com.ty.lift.common.model.PushMessage;
+import cn.com.ty.lift.common.model.PushUserInfo;
+import cn.com.ty.lift.enterprise.push.PushUserService;
 import cn.com.ty.lift.enterprise.region.dao.entity.AreaCode;
 import cn.com.ty.lift.enterprise.region.dao.entity.Region;
 import cn.com.ty.lift.enterprise.region.dao.entity.model.RegionReq;
@@ -11,8 +14,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
+import org.springframework.jms.core.JmsMessagingTemplate;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -29,6 +34,8 @@ import java.util.Map;
 @AllArgsConstructor
 public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> implements RegionService {
     private final AreaCodeServiceImpl areaCodeService;
+    private final PushUserService pushUserService;
+    private final JmsMessagingTemplate jmsMessagingTemplate;
 
     public RestResponse regions(RegionReq req) {
         Page<Region> page = new Page<>(req.getPageNum(), req.getPageSize());
@@ -157,4 +164,28 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
     public List<Map<String, Object>> areas(String cityCode) {
         return baseMapper.areas(cityCode);
     }
+
+    public void push(String areaName, String oldUser, String newUser, Region byId, Region region) {
+        List<PushUserInfo> userInfos = new ArrayList<>(10);
+        //添加企业管理员
+        userInfos.addAll(pushUserService.listEnterpriseAdmin(byId.getMtCompanyId()));
+        //添加新老区域主管
+        userInfos.add(pushUserService.listByUserId(byId.getMtCompanyId(), byId.getUserId()));
+        userInfos.add(pushUserService.listByUserId(byId.getMtCompanyId(), region.getUserId()));
+        String[] stringIds = byId.getClerk().replace(" ", "").split(",");
+        List<PushUserInfo> clerks = new ArrayList<>();
+        if (stringIds.length > 0) {
+            List<Long> ids = new ArrayList<>();
+            for (String stringId : stringIds) {
+                ids.add(Long.valueOf(stringId));
+            }
+            clerks = pushUserService.listByUserIds(byId.getMtCompanyId(), ids);
+        }
+        //添加区域下的文员
+        userInfos.addAll(clerks);
+        //推送消息
+        PushMessage
+                .workReplaceRegionCharger(areaName, oldUser, newUser)
+                .sendTokenOnPlatform(jmsMessagingTemplate, userInfos);
+    }
 }

lift-quan-service/src/main/java/cn/com/ty/lift/quan/QuanApplication.java

@@ -5,6 +5,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.jms.annotation.EnableJms;
 
 /**
  * @Author xwy
@@ -13,6 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @Slf4j
 @EnableFeignClients
 @MapperScan("cn.com.ty.**.dao.mapper")
+@EnableJms
 @SpringBootApplication(scanBasePackages = {"cn.com.ty.lift", "cn.com.xwy.boot"})
 public class QuanApplication {
 

lift-quan-service/src/main/java/cn/com/ty/lift/quan/news/controller/QuanNewsController.java

@@ -1,10 +1,13 @@
 package cn.com.ty.lift.quan.news.controller;
 
+import cn.com.ty.lift.common.model.PushMessage;
 import cn.com.ty.lift.quan.news.dao.entity.QuanNews;
 import cn.com.ty.lift.quan.news.dao.entity.model.QuanNewsReq;
 import cn.com.ty.lift.quan.news.service.impl.QuanNewsServiceImpl;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import lombok.AllArgsConstructor;
+import org.springframework.jms.core.JmsMessagingTemplate;
+import org.springframework.jms.core.JmsTemplate;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
@@ -22,6 +25,7 @@ import java.io.IOException;
 @RequestMapping("/news")
 public class QuanNewsController {
     private final QuanNewsServiceImpl quanNewsService;
+    private final JmsMessagingTemplate jmsMessagingTemplate;
 
     /**
      * 分页展示置顶新闻+普通新闻
@@ -65,9 +69,8 @@ public class QuanNewsController {
      */
     @PostMapping("/add")
     public RestResponse add(@RequestBody QuanNews quanNews) {
-        if (!quanNews.getIsTop()) {
-            quanNews.setTopSerial(0);
-        }
+        //推送消息给全平台
+        PushMessage.newsNotice(quanNews.getTitle()).sendAllOnPlatform(jmsMessagingTemplate);
         return RestResponse.success(quanNewsService.save(quanNews));
     }
 
@@ -80,9 +83,6 @@ public class QuanNewsController {
      */
     @PostMapping("/modify")
     public RestResponse updateNews(@RequestBody QuanNews quanNews) {
-        if (!quanNews.getIsTop()) {
-            quanNews.setTopSerial(0);
-        }
         return RestResponse.success(quanNewsService.updateById(quanNews));
     }
 

lift-system-service/src/main/java/cn/com/ty/lift/system/SystemApplication.java

@@ -5,6 +5,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.jms.annotation.EnableJms;
 import org.springframework.web.bind.annotation.CrossOrigin;
 
 /**

lift-upload/src/main/java/com/Application.java

@@ -1,4 +1,4 @@
-package com;
+package com.upload;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

lift-upload/src/main/java/com/controller/common/CustomCORSConfiguration.java

@@ -1,4 +1,4 @@
-package com.controller.common;
+package com.upload.controller;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

lift-upload/src/main/java/com/controller/common/RestResponse.java

@@ -1,4 +1,4 @@
-package com.controller.common;
+package com.upload.controller;
 
 import java.io.Serializable;
 

lift-upload/src/main/java/com/controller/common/SystemConfiguration.java

@@ -1,4 +1,4 @@
-package com.controller.common;
+package com.upload.controller;
 
 import cn.com.ty.lift.common.aliservice.aliyunoss.AliyunOSS;
 import cn.com.ty.lift.common.export.ExportUtils;

lift-upload/src/main/java/com/controller/common/CommonController.java

@@ -1,4 +1,4 @@
-package com.controller.common;
+package com.upload.controller;
 
 import cn.com.ty.lift.common.utils.ValuePool;
 import cn.com.ty.lift.common.verify.Validate;
@@ -24,7 +24,7 @@ import java.util.*;
 @AllArgsConstructor
 @RestController
 @RequestMapping("common")
-public class CommonController {
+public class UploadController {
 
     private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy/MM/dd");
 

lift-upload/src/main/java/com/controller/common/ValidateMethodInterceptor.java

@@ -1,4 +1,4 @@
-package com.controller.common;
+package com.upload.controller;
 
 import cn.com.ty.lift.common.verify.Val;
 import cn.com.ty.lift.common.verify.Validation;