切换网格v1

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@@ -2,11 +2,12 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.result.LatestCustomerResultDTO;
+import com.epmet.dto.form.StaffGridVisitedFormDTO;
 import com.epmet.feign.fallback.EpmetUserFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * @Description
@@ -15,4 +16,13 @@ import org.springframework.web.bind.annotation.PathVariable;
 @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class)
 public interface EpmetUserFeignClient {
 
+    /**
+     * @param staffGridVisitedFormDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 保存网格访问记录
+     * @Date 2020/4/23 13:27
+     **/
+    @PostMapping(value = "/epmetuser/staffgridvisited/savestaffgridvisitedrecord", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result saveStaffGridVisitedRecord(@RequestBody StaffGridVisitedFormDTO staffGridVisitedFormDTO);
 }

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java

@@ -3,7 +3,7 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.result.LatestCustomerResultDTO;
+import com.epmet.dto.form.StaffGridVisitedFormDTO;
 import com.epmet.feign.EpmetUserFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -14,4 +14,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class EpmetUserFeignClientFallback implements EpmetUserFeignClient {
 
+    @Override
+    public Result saveStaffGridVisitedRecord(StaffGridVisitedFormDTO staffGridVisitedFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "saveStaffGridVisitedRecord", staffGridVisitedFormDTO);
+    }
 }

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java

@@ -18,12 +18,17 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.StaffGridVisitedFormDTO;
 import com.epmet.dto.form.SwitchGridFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.dto.result.LatestCustomerResultDTO;
+import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.service.StaffAgencyService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -36,9 +41,11 @@ import java.util.List;
  */
 @Service
 public class StaffAgencyServiceImpl implements StaffAgencyService {
-
+    private static Logger logger = LoggerFactory.getLogger(StaffAgencyServiceImpl.class);
     @Autowired
     private GovOrgFeignClient govOrgFeignClient;
+    @Autowired
+    private EpmetUserFeignClient epmetUserFeignClient;
 
     /**
      * @param tokenDTO
@@ -60,6 +67,12 @@ public class StaffAgencyServiceImpl implements StaffAgencyService {
     @Override
     public Result<List<String>> switchGrid(SwitchGridFormDTO switchGridFormDTO) {
         //记录网格访问记录
+        StaffGridVisitedFormDTO staffGridVisitedFormDTO = ConvertUtils.sourceToTarget(switchGridFormDTO, StaffGridVisitedFormDTO.class);
+        Result saveStaffGridVisitedRecord = epmetUserFeignClient.saveStaffGridVisitedRecord(staffGridVisitedFormDTO);
+        if (!saveStaffGridVisitedRecord.success()) {
+            logger.error("保存网格访问记录失败");
+            return new Result<List<String>>().error();
+        }
         //查询网格的权限
         return new Result<>();
     }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffGridVisitedFormDTO.java

@@ -0,0 +1,34 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 保存网格访问记录入参
+ * @Author yinzuomei
+ * @Date 2020/4/23 11:01
+ */
+@Data
+public class StaffGridVisitedFormDTO implements Serializable {
+    private static final long serialVersionUID = 4932900259489068815L;
+    /**
+     * 客户ID
+     */
+    @NotBlank(message = "客户id")
+    private String customerId;
+
+    /**
+     * 网格ID
+     */
+    @NotBlank(message = "网格id不能为空")
+    private String gridId;
+
+    /**
+     * customer_staff.userId
+     */
+    @NotBlank(message = "staffId不能为空")
+    private String staffId;
+}
+

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffGridVisitedController.java

@@ -17,11 +17,17 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.StaffGridVisitedFormDTO;
 import com.epmet.service.StaffGridVisitedService;
 import org.springframework.beans.factory.annotation.Autowired;
+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 javax.validation.Valid;
+
 
 /**
  * 工作人员进入网格日志表
@@ -36,4 +42,15 @@ public class StaffGridVisitedController {
     @Autowired
     private StaffGridVisitedService staffGridVisitedService;
 
+    /**
+     * @param staffGridVisitedFormDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 保存网格访问记录
+     * @Date 2020/4/23 11:19
+     **/
+    @PostMapping("savestaffgridvisitedrecord")
+    public Result saveStaffGridVisitedRecord(@RequestBody @Valid StaffGridVisitedFormDTO staffGridVisitedFormDTO) {
+        return staffGridVisitedService.saveStaffGridVisitedRecord(staffGridVisitedFormDTO);
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffGridVisitedService.java

@@ -19,7 +19,9 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StaffGridVisitedDTO;
+import com.epmet.dto.form.StaffGridVisitedFormDTO;
 import com.epmet.entity.StaffGridVisitedEntity;
 
 import java.util.List;
@@ -92,4 +94,13 @@ public interface StaffGridVisitedService extends BaseService<StaffGridVisitedEnt
      * @date 2020-04-21
      */
     void delete(String[] ids);
+
+    /**
+     * @param staffGridVisitedFormDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 保存网格访问记录
+     * @Date 2020/4/23 11:20
+     **/
+    Result saveStaffGridVisitedRecord(StaffGridVisitedFormDTO staffGridVisitedFormDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffGridVisitedServiceImpl.java

@@ -23,8 +23,10 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.StaffGridVisitedDao;
 import com.epmet.dto.StaffGridVisitedDTO;
+import com.epmet.dto.form.StaffGridVisitedFormDTO;
 import com.epmet.entity.StaffGridVisitedEntity;
 import com.epmet.service.StaffGridVisitedService;
 import org.apache.commons.lang3.StringUtils;
@@ -96,4 +98,12 @@ public class StaffGridVisitedServiceImpl extends BaseServiceImpl<StaffGridVisite
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+
+    @Override
+    public Result saveStaffGridVisitedRecord(StaffGridVisitedFormDTO staffGridVisitedFormDTO) {
+        StaffGridVisitedEntity entity = ConvertUtils.sourceToTarget(staffGridVisitedFormDTO, StaffGridVisitedEntity.class);
+        insert(entity);
+        return new Result();
+    }
+
 }