Merge branch 'feature/visit_zhy'

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/PliPowerFeignClient.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 @FeignClient(name = ServiceConstant.PLI_POWER_SERVER, fallbackFactory = PliPowerFeignClientFallBackFactory.class)
 public interface PliPowerFeignClient {
 
-    @PostMapping("/pli/power/visitVisitor/logout")
+    @PostMapping("/pli/power/visitVisitor/visitorlogout")
     Result visitorLogout(@RequestBody VisitorLogoutFormDTO formDTO);
 
 }

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/impl/PliPowerFeignClientFallBack.java

@@ -18,7 +18,7 @@ public class PliPowerFeignClientFallBack implements PliPowerFeignClient {
 
     @Override
     public Result visitorLogout(VisitorLogoutFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.PLI_POWER_SERVER, "logout",formDTO);
+        return ModuleUtils.feignConError(ServiceConstant.PLI_POWER_SERVER, "visitorLogout",formDTO);
     }
 
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml

@@ -207,7 +207,7 @@
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
-                <nacos.ip>192.168.43.33</nacos.ip>
+                <nacos.ip>192.168.43.132</nacos.ip>
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
 

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/controller/VisitVisitorController.java

@@ -7,8 +7,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.plugin.power.dto.visit.VisitVisitorDTO;
 import com.epmet.plugin.power.dto.visit.form.VisitVisitorChartFormDTO;
 import com.epmet.plugin.power.dto.visit.form.VisitVisitorFormDTO;
@@ -91,9 +91,8 @@ public class VisitVisitorController {
         return new Result();
     }
 
-    @NoRepeatSubmit
-    @PostMapping("logout")
-    public Result logout(@RequestBody VisitorLogoutFormDTO dto) {
+    @PostMapping("visitorlogout")
+    public Result visitorLogout(@RequestBody VisitorLogoutFormDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         visitVisitorService.logout(dto);

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/visit/VisitVisitorDao.xml

@@ -45,7 +45,7 @@
         FROM
             pli_visit_visitor
         WHERE
-            DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) = #{dateId}
+            DATE_FORMAT( CREATED_TIME, '%Y%m%d' ) = #{dateId}
     </select>
 
 </mapper>