Merge branch 'dev' into test

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructLeaderFormDTO.java

@@ -3,7 +3,6 @@ package com.epmet.plugin.power.dto.axis.form;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
@@ -32,5 +31,10 @@ public class PowerAxisStructLeaderFormDTO implements Serializable {
      */
     private String leaderName;
 
+    /**
+     * 客户id
+     */
+    private String customerId;
+
 
-}
+}

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

@@ -108,6 +108,7 @@ public class PowerAxisStructController {
                 formDto.setAgencyId(staffInfo.getAgencyId());
             }
         }
+        formDto.setCustomerId(tokenDto.getCustomerId());
         return new Result().ok(powerAxisStructService.selectAllForTree(formDto));
     }
 

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

@@ -38,8 +38,8 @@ public class PowerAxisTagController {
     private PowerAxisTagService powerAxisTagService;
 
     @RequestMapping("page")
-    public Result<PageData<PowerAxisTagDTO>> page(@RequestParam Map<String, Object> params) {
-        PageData<PowerAxisTagDTO> page = powerAxisTagService.page(params);
+    public Result<PageData<PowerAxisTagDTO>> page(@LoginUser TokenDto tokenDto,@RequestParam Map<String, Object> params) {
+        PageData<PowerAxisTagDTO> page = powerAxisTagService.page(tokenDto,params);
         return new Result<PageData<PowerAxisTagDTO>>().ok(page);
     }
 
@@ -102,8 +102,8 @@ public class PowerAxisTagController {
      * @date 2022/4/19/0019 9:24
      */
     @PostMapping("listSimpleAll")
-    public Result<List<PowerAxisAllTagCategoryResultDTO>> listSimpleAll() {
-        return new Result().ok(powerAxisTagService.listSimpleAll());
+    public Result<List<PowerAxisAllTagCategoryResultDTO>> listSimpleAll(@LoginUser TokenDto tokenDto) {
+        return new Result().ok(powerAxisTagService.listSimpleAll(tokenDto));
     }
 
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java

@@ -2,16 +2,18 @@ package com.epmet.plugin.power.modules.axis.dao;
 
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.plugin.power.dto.axis.PowerAxisStructDTO;
-import com.epmet.plugin.power.dto.axis.form.*;
-import com.epmet.plugin.power.dto.axis.result.*;
+import com.epmet.plugin.power.dto.axis.form.PowerAxisListPositionFormDTO;
+import com.epmet.plugin.power.dto.axis.form.PowerAxisStructFormDTO;
+import com.epmet.plugin.power.dto.axis.form.PowerAxisStructLeaderFormDTO;
+import com.epmet.plugin.power.dto.axis.form.PowerAxisStructStructTreeFormDTO;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisListPositionResultDTO;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisStructLeaderResultDTO;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisStructResultDTO;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisStructTreeResultDTO;
 import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-import java.util.Map;
-
 import java.util.List;
 
 /**
@@ -125,4 +127,5 @@ public interface PowerAxisStructDao extends BaseDao<PowerAxisStructEntity> {
     String getRootAxisStructId(@Param("customerId") String customerId,
                                @Param("agencyId") String agencyId,
                                @Param("structLevel") int structLevel);
-}
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisTagDao.java

@@ -1,12 +1,15 @@
 package com.epmet.plugin.power.modules.axis.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.plugin.power.dto.axis.PowerAxisTagDTO;
 import com.epmet.plugin.power.dto.axis.result.PowerAxisAllTagCategoryResultDTO;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisTagCategoryResultDTO;
 import com.epmet.plugin.power.modules.axis.entity.PowerAxisTagEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 动力主轴标签
@@ -24,7 +27,7 @@ public interface PowerAxisTagDao extends BaseDao<PowerAxisTagEntity> {
      * @author work@yujt.net.cn
      * @date 2022/4/19/0019 9:14
      */
-    List<PowerAxisAllTagCategoryResultDTO> listSimpleAll();
+    List<PowerAxisAllTagCategoryResultDTO> listSimpleAll(@Param("customerId") String customerId);
 
     /**
      * 根据ID查询节点等级
@@ -39,4 +42,9 @@ public interface PowerAxisTagDao extends BaseDao<PowerAxisTagEntity> {
     Integer selectStructLevelById(@Param("customerId") String customerId,
                                   @Param("tagCategory") String tagCategory,
                                   @Param("axisStructId") String axisStructId);
-}
+
+    List<PowerAxisTagCategoryResultDTO> selectByTagCategory(@Param("tagCategory") String tagCategory,
+                                                            @Param("customerId") String customerId);
+
+    List<PowerAxisTagDTO> getPageList(Map<String, Object> params);
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java

@@ -165,4 +165,4 @@ public interface PowerAxisStructService extends BaseService<PowerAxisStructEntit
      * @date 2022/5/12/0012 10:26
      */
     String getRootAxisStructId(String rootStructId, String customerId, String agencyId);
-}
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisTagService.java

@@ -3,6 +3,7 @@ package com.epmet.plugin.power.modules.axis.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.plugin.power.dto.axis.PowerAxisTagDTO;
 import com.epmet.plugin.power.dto.axis.result.PowerAxisAllTagCategoryResultDTO;
 import com.epmet.plugin.power.dto.axis.result.PowerAxisTagCategoryResultDTO;
@@ -27,7 +28,7 @@ public interface PowerAxisTagService extends BaseService<PowerAxisTagEntity> {
      * @author generator
      * @date 2022-04-18
      */
-    PageData<PowerAxisTagDTO> page(Map<String, Object> params);
+    PageData<PowerAxisTagDTO> page(TokenDto tokenDto,Map<String, Object> params);
 
     /**
      * 默认查询
@@ -96,7 +97,7 @@ public interface PowerAxisTagService extends BaseService<PowerAxisTagEntity> {
      * @author work@yujt.net.cn
      * @date 2022/4/19/0019 9:23
      */
-    List<PowerAxisAllTagCategoryResultDTO> listSimpleAll();
+    List<PowerAxisAllTagCategoryResultDTO> listSimpleAll(TokenDto tokenDto);
 
     /**
      * 根据标签编码，查询节点级别
@@ -121,4 +122,4 @@ public interface PowerAxisTagService extends BaseService<PowerAxisTagEntity> {
      * @date 2022/4/23/0023 15:51
      */
     Integer selectStructLevelById(String customerId, String tagCategory, String axisStructId);
-}
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java

@@ -2,7 +2,6 @@ package com.epmet.plugin.power.modules.axis.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -144,8 +143,9 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "同一组织下只允许存在一个顶级节点");
             }
         } else {
-            int parentStructLevel = powerAxisTagService.selectStructLevelById(customerId, PowerTagCategoryEnum.STRUCT.category(), structDto.getPid());
-            if (structLevel - parentStructLevel > NumConstant.ONE) {
+            Integer parentStructLevel = powerAxisTagService.selectStructLevelById(customerId, PowerTagCategoryEnum.STRUCT.category(), structDto.getPid());
+            parentStructLevel = parentStructLevel == null?0:parentStructLevel;
+            if (structLevel.intValue() - parentStructLevel.intValue() > NumConstant.ONE) {
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "无法跨级添加节点");
             }
         }
@@ -274,4 +274,4 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
         }
         return baseDao.getRootAxisStructId(customerId, agencyId, PowerTagLevelEnum.ROOT.level());
     }
-}
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java

@@ -10,6 +10,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.plugin.power.dto.axis.PowerAxisTagDTO;
@@ -41,12 +42,16 @@ public class PowerAxisTagServiceImpl extends BaseServiceImpl<PowerAxisTagDao, Po
 
 
     @Override
-    public PageData<PowerAxisTagDTO> page(Map<String, Object> params) {
-        IPage<PowerAxisTagEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, true),
-                getWrapper(params)
-        );
-        return getPageData(page, PowerAxisTagDTO.class);
+    public PageData<PowerAxisTagDTO> page(TokenDto tokenDto,Map<String, Object> params) {
+//        IPage<PowerAxisTagEntity> page = baseDao.selectPage(
+//                getPage(params, FieldConstant.CREATED_TIME, true),
+//                getWrapper(params)
+//        );
+//        return getPageData(page, PowerAxisTagDTO.class);
+        params.put("customerId", tokenDto.getCustomerId());
+        IPage<PowerAxisTagDTO> page = getPage(params);
+        List<PowerAxisTagDTO> list = baseDao.getPageList(params);
+        return new PageData<>(list, page.getTotal());
     }
 
     @Override
@@ -102,18 +107,22 @@ public class PowerAxisTagServiceImpl extends BaseServiceImpl<PowerAxisTagDao, Po
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "缺少参数");
         }
 
-        QueryWrapper<PowerAxisTagEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq("TAG_CATEGORY", tagCategory)
-                .eq("FORBIDDEN_FLAG", EpmetDelFlagEnum.NORMAL.value())
-                .eq(FieldConstant.CUSTOMER_ID, customerId)
-                .orderByAsc("STRUCT_LEVEL", FieldConstant.CREATED_TIME);
+        List<PowerAxisTagCategoryResultDTO> res = baseDao.selectByTagCategory(tagCategory,customerId);
+        return res;
+
 
-        return ConvertUtils.sourceToTarget(baseDao.selectList(wrapper), PowerAxisTagCategoryResultDTO.class);
+//        QueryWrapper<PowerAxisTagEntity> wrapper = new QueryWrapper<>();
+//        wrapper.eq("TAG_CATEGORY", tagCategory)
+//                .eq("FORBIDDEN_FLAG", EpmetDelFlagEnum.NORMAL.value())
+//                .eq(FieldConstant.CUSTOMER_ID, customerId)
+//                .orderByAsc("STRUCT_LEVEL", FieldConstant.CREATED_TIME);
+//
+//        return ConvertUtils.sourceToTarget(baseDao.selectList(wrapper), PowerAxisTagCategoryResultDTO.class);
     }
 
     @Override
-    public List<PowerAxisAllTagCategoryResultDTO> listSimpleAll() {
-        return baseDao.listSimpleAll();
+    public List<PowerAxisAllTagCategoryResultDTO> listSimpleAll(TokenDto tokenDto) {
+        return baseDao.listSimpleAll(tokenDto.getCustomerId());
     }
 
     @Override
@@ -135,4 +144,4 @@ public class PowerAxisTagServiceImpl extends BaseServiceImpl<PowerAxisTagDao, Po
     public Integer selectStructLevelById(String customerId, String tagCategory, String axisStructId) {
         return baseDao.selectStructLevelById(customerId, tagCategory, axisStructId);
     }
-}
+}

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

@@ -680,7 +680,7 @@ public class DhDeviceUtil {
         cardFormDTO.setCategory("0");
         cardFormDTO.setCardStatus("ACTIVE");
         cardFormDTO.setStartDate(LocalDate.now().toString());
-        cardFormDTO.setEndDate(LocalDate.now().toString());
+        cardFormDTO.setEndDate(LocalDate.now().plusDays(180L).toString());
         String pwd;
         try {
             pwd = RSAUtils.getPwdByRsa(getPublicKey(), "123456");

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml

@@ -50,16 +50,17 @@
         LEFT JOIN
             pli_power_axis_struct AS poas
         ON
-            poas.id = #{axisStructId}
+            poas.id = #{axisStructId} and poas.del_flag = '0'
         LEFT JOIN
             pli_power_axis_tag AS ppat
         ON
-            poas.CATEGORY_CODE = ppat.CATEGORY_CODE
+            poas.CATEGORY_CODE = ppat.CATEGORY_CODE and ppat.del_flag = '0'
         WHERE
 	        ppal.id = #{leaderId}
 	    AND
 	        ppal.customer_id = #{customerId}
+        and ppal.del_flag = '0'
     </select>
 
 
-</mapper>
+</mapper>

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml

@@ -47,19 +47,20 @@
         l.MOBILE as LEADER_MOBILE,
         t.STRUCT_LEVEL
         from pli_power_axis_struct s
-        left join pli_power_axis_struct_leader sl on s.ID = sl.STRUCT_REFERENCE_ID and sl.del_flag = '0'
-        left join pli_power_axis_leader l on l.ID = sl.LEADER_ID and l.del_flag = '0'
-        left join pli_power_axis_tag t on s.CATEGORY_CODE = t.CATEGORY_CODE and t.DEL_FLAG = '0'
+        left join pli_power_axis_struct_leader sl on s.ID = sl.STRUCT_REFERENCE_ID and sl.del_flag = '0' and sl.CUSTOMER_ID = #{customerId}
+        left join pli_power_axis_leader l on l.ID = sl.LEADER_ID and l.del_flag = '0' and l.CUSTOMER_ID = #{customerId}
+        left join pli_power_axis_tag t on s.CATEGORY_CODE = t.CATEGORY_CODE and t.DEL_FLAG = '0' and t.CUSTOMER_ID = #{customerId}
         where s.DEL_FLAG = '0'
-        <if test="agencyId != null and agencyId != ''">
-            and s.AGENCY_ID = #{agencyId}
-        </if>
-        <if test="axisName != null and axisName != ''">
-            and s.NAME like '%${axisName}%'
-        </if>
-        <if test="leaderName != null and leaderName != ''">
-            and l.NAME like '%${leaderName}%'
-        </if>
+              and s.CUSTOMER_ID = #{customerId}
+                <if test="agencyId != null and agencyId != ''">
+                    and s.AGENCY_ID = #{agencyId}
+                </if>
+                <if test="axisName != null and axisName != ''">
+                    and s.NAME like '%${axisName}%'
+                </if>
+                <if test="leaderName != null and leaderName != ''">
+                    and l.NAME like '%${leaderName}%'
+                </if>
         order by s.sort,s.CREATED_TIME,l.CREATED_TIME
     </select>
 
@@ -89,7 +90,7 @@
         </where>
     </select>
 
-    <select id="countRepeatStructByName" resultType="java.lang.Integer">
+    <select id="countRepeatStructByName" resultType="int">
         SELECT
         count(*)
         FROM
@@ -108,7 +109,7 @@
         <if test="id != null and id != ''">AND s.ID != #{id}</if>
         <if test="pid != null and pid != ''">AND s.pid = #{pid}</if>
     </select>
-    <select id="countRepeatStructByCategory" resultType="java.lang.Integer">
+    <select id="countRepeatStructByCategory" resultType="int">
         SELECT
         count(*)
         FROM
@@ -257,6 +258,4 @@
             AND s.DEL_FLAG = '0'
             AND t.STRUCT_LEVEL = #{structLevel}
     </select>
-
-
-</mapper>
+</mapper>

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisTagDao.xml

@@ -29,7 +29,12 @@
     </resultMap>
 
     <select id="listSimpleAll" resultMap="listSimpleAllResultMap">
-        select t.TAG_CATEGORY,t.CATEGORY_NAME,t.CATEGORY_CODE,t.STRUCT_LEVEL from pli_power_axis_tag t where t.DEL_FLAG = '0' and t.FORBIDDEN_FLAG = '0' order by t.STRUCT_LEVEL
+        select t.TAG_CATEGORY,t.CATEGORY_NAME,t.CATEGORY_CODE,t.STRUCT_LEVEL
+        from pli_power_axis_tag t
+        where t.DEL_FLAG = '0'
+              and t.FORBIDDEN_FLAG = '0'
+              and CUSTOMER_ID = #{customerId}
+        order by t.STRUCT_LEVEL
     </select>
     <select id="selectStructLevelById" resultType="java.lang.Integer">
         SELECT
@@ -45,6 +50,21 @@
             AND t.CUSTOMER_ID = #{customerId}
             AND s.id = #{axisStructId}
     </select>
+    <select id="selectByTagCategory"
+            resultType="com.epmet.plugin.power.dto.axis.result.PowerAxisTagCategoryResultDTO">
+        select * from pli_power_axis_tag where
+            TAG_CATEGORY = #{tagCategory}
+	        AND FORBIDDEN_FLAG = '0'
+	        AND CUSTOMER_ID = #{customerId}
+	        order by STRUCT_LEVEL,CREATED_TIME DESC
+    </select>
+    <select id="getPageList" resultType="com.epmet.plugin.power.dto.axis.PowerAxisTagDTO">
+        select *
+        from pli_power_axis_tag
+        where DEL_FLAG = '0'
+              and CUSTOMER_ID = #{customerId}
+        order by CREATED_TIME asc
+    </select>
 
 
-</mapper>
+</mapper>

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

@@ -33,7 +33,7 @@
             COUNT( v.id ) AS num
         FROM
             pli_chart_hour h
-                LEFT JOIN pli_visit_visitor v ON h.`hour` = DATE_FORMAT( v.CREATED_TIME, '%h' )
+                LEFT JOIN pli_visit_visitor v ON h.`hour` = DATE_FORMAT( v.CREATED_TIME, '%H' )
                 AND DATE_FORMAT( v.CREATED_TIME, '%Y-%m-%d' ) = #{date}
         GROUP BY
             h.`hour`;

pom.xml

@@ -118,5 +118,11 @@
             </snapshots>
         </pluginRepository>
     </pluginRepositories>
+    <distributionManagement>
+        <repository>
+            <id>epmet</id>
+            <url>https://nexus.elinkservice.cn/repository/maven-releases/</url>
+        </repository>
+    </distributionManagement>
 
 </project>