Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/TjDto/TjOrgCountDto.java

@@ -73,4 +73,6 @@ public class TjOrgCountDto implements Serializable {
 
     private String name;
 
+    private Integer level;
+
 }
\ No newline at end of file

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/TjDto/TjOrgPriceDto.java

@@ -45,4 +45,7 @@ public class TjOrgPriceDto {
     private String sizeName;
     private String typeId;
     private String typeName;
+
+    //0表示本级数据，1表示直属下级不包含下一级的组织机构
+    private Integer level;
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/ApplicationReq.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.junmp.v2.common.bean.request.BaseRequest;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.ibatis.annotations.Param;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -24,6 +25,7 @@ public class ApplicationReq extends BaseRequest {
      * 应用代码
      */
     @TableField("app_code")
+    @NotBlank(message = "应用代码不能为空",groups = {detail.class})
     private String appCode;
 
     /**

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/TjReq/TjOrgCountReq.java

@@ -24,4 +24,6 @@ public class TjOrgCountReq extends BaseRequest {
 
     private String order;
     private String column;
+
+    private Integer level;
 }
\ No newline at end of file

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/TjReq/TjOrgEqsReq.java

@@ -14,6 +14,8 @@ public class TjOrgEqsReq extends BaseRequest {
     List<String> typeIdsList;
     private List<String> sizeNameList;
 
+    private Integer level;
+
     // 添加一个用逗号分隔typeIdsList的方法
     public String getTypeIdsAsString() {
         return String.join(",", typeIdsList);

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/TjReq/TjOrgPriceReq.java

@@ -20,4 +20,6 @@ public class TjOrgPriceReq extends BaseRequest {
 
     private Integer levelNum;
 
+    private Integer level;
+
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/PublicExceptionEnum.java

@@ -8,7 +8,12 @@ import lombok.Getter;
 @Getter
 public enum PublicExceptionEnum implements IExceptionEnum {
 
-    FILE_DEL_FAILTURE(CommonConstant.DEFAULT_USER_ERROR_CODE,"文件删除失败");
+    FILE_DEL_FAILTURE(CommonConstant.DEFAULT_USER_ERROR_CODE,"文件删除失败"),
+
+    //设备编号重复
+    APP_CODE_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"应用代码已存在"),
+    APP_NAME_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"应用名称已存在")
+    ;
 
     /**
      * 错误编码

jyzb-biz/src/main/java/com/junmp/jyzb/controller/ApplicationController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 应用管理模块
@@ -36,6 +37,19 @@ public class ApplicationController {
         return ApiRes.success(applicationService.GetAllUpdateCfg(req));
     }
 
+    @PostMapping(path="/GetAllUpdateCfgList",name="获取应用信息的列表#enable")
+    @ApiOperation("获取应用信息的列表")
+    public ApiRes<List<Application>> GetAllUpdateCfgList(@RequestBody ApplicationReq req){
+        return ApiRes.success(applicationService.GetAllUpdateCfgList(req));
+    }
+
+    @PostMapping(path="/GetOne",name="获取应用信息一个#enable")
+    @ApiOperation("获取应用信息一个")
+    public ApiRes<Application> GetOne(@RequestBody @Validated(ValidationApi.detail.class) ApplicationReq req){
+        return ApiRes.success(applicationService.GetOne(req));
+    }
+
+
     //新增或者修改应用信息
     @PostMapping(path="/AddOrUpdateCfg",name="新增应用信息#logType=30")
     @ApiOperation("新增应用信息")

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/EquipmentCountSummaryMapper.java

@@ -39,13 +39,21 @@ public interface EquipmentCountSummaryMapper extends BaseMapper<EquipmentCountSu
                                   @Param("monthList") List<Integer> monthList,
                                   @Param("levelFlag")Integer levelFlag);
 
+    TjOrgCountDto TjOrgCountSelf(@Param("orgId") Long orgId,
+                                 @Param("typeIdsList") List<String> typeIdsList,
+                                 @Param("sizeNameList") List<String> sizeNameList,
+                                 @Param("year") Integer year,
+                                 @Param("typeParentId")String typeParentId,
+                                 @Param("monthList") List<Integer> monthList);
+
     List<TjOrgCountDto> TjOrgCountTotalNum(@Param("orgId") Long orgId,
                                            @Param("typeIdsList") List<String> typeIdsList,
                                            @Param("sizeNameList") List<String> sizeNameList,
                                            @Param("year") Integer year,
                                            @Param("typeParentId")String typeParentId,
                                            @Param("monthList") List<Integer> monthList,
-                                           @Param("levelNum")Integer levelNum);
+                                           @Param("levelNum")Integer levelNum,
+                                           @Param("level")Integer level);
 
 
     FinalTjOrgCountDto TjOrgCountSum(@Param("orgId") Long orgId,

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventorySummaryMapper.java

@@ -8,7 +8,6 @@ import com.junmp.jyzb.api.bean.query.InventoryReq;
 import com.junmp.jyzb.api.bean.query.InventorySumReq;
 import com.junmp.jyzb.api.bean.query.SelectTotalNumReq;
 import com.junmp.jyzb.entity.InventorySummary;
-import liquibase.pro.packaged.L;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -54,12 +53,16 @@ public interface InventorySummaryMapper  extends BaseMapper<InventorySummary> {
 
     List<TjOrgEqsDto> selectDynamicView();
 
-    void insertToSummary(@Param("summaryTableName") String summaryTableName,@Param("sourceTableName") String sourceTableName, @Param("warrantyThreshold") Integer warrantyThreshold);
+    void insertToSummary(@Param("summaryTableName") String summaryTableName,
+                         @Param("sourceTableName") String sourceTableName,
+                         @Param("warrantyThreshold") Integer warrantyThreshold);
 
     List<TjOrgEqsDto> selectViewOrgeqsSum();
-    List<TjOrgEqsDto> getTotalDataDetail(@Param("orgId") String orgId,@Param("typeIdsList") List<String> typeIdsList,
-                                         @Param("sizeNameList") List<String> sizeNameList,@Param("levelNum") Integer levelNum);
-
+//    List<TjOrgEqsDto> getTotalDataDetail(@Param("orgId") String orgId, @Param("typeIdsList") List<String> typeIdsList,
+//                                         @Param("sizeNameList") List<String> sizeNameList, @Param("levelNum") Integer levelNum);
+    List<TjOrgEqsDto> getTotalDataDetail(@Param("orgId") String orgId, @Param("typeIdsList") List<String> typeIdsList,
+                                         @Param("sizeNameList") List<String> sizeNameList, @Param("levelNum") Integer levelNum,
+                                         @Param("level")Integer level);
 
     void useViewOrgeqs(@Param("sql") String sql,@Param("orgId") Long orgId,@Param("sql1") String sql1);
 

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/PriceSumSummaryMapper.java

@@ -57,10 +57,27 @@ public interface PriceSumSummaryMapper extends BaseMapper<PriceSumSummary> {
                                   @Param("typeIdsList") List<String> typeIdsList,
                                   @Param("sizeNameList")List<String> sizeNameList,
                                   @Param("levelFlag")Integer levelFlag);
+//    TjOrgPriceDto TjOrgPriceLeve4(@Param("orgId") Long orgId,
+//                                  @Param("year") Integer year,
+//                                  @Param("typeIdsList") List<String> typeIdsList,
+//                                  @Param("sizeNameList")List<String> sizeNameList,
+//                                  @Param("levelFlag")Integer levelFlag);
 
+
+    TjOrgPriceDto TjOrgPriceBySelf(@Param("orgId") Long orgId,
+                                   @Param("year") Integer year,
+                                   @Param("typeIdsList") List<String> typeIdsList,
+                                   @Param("sizeNameList")List<String> sizeNameList);
     List<TjOrgPriceDto> TjOrgPriceTotalNum(@Param("orgId") Long orgId,
                                            @Param("year") Integer year,
                                            @Param("typeIdsList") List<String> typeIdsList,
                                            @Param("sizeNameList")List<String> sizeNameList,
-                                           @Param("levelNum")Integer levelNum);
+                                           @Param("levelNum")Integer levelNum,
+                                           @Param("level")Integer level);
+//    List<TjOrgPriceDto> TjOrgPriceTotalNum(@Param("orgId") Long orgId,
+//                                           @Param("year") Integer year,
+//                                           @Param("typeIdsList") List<String> typeIdsList,
+//                                           @Param("sizeNameList")List<String> sizeNameList,
+//                                           @Param("levelNum")Integer levelNum);
+
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/ApplicationService.java

@@ -5,6 +5,8 @@ import com.junmp.jyzb.entity.Application;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.junmp.v2.db.api.page.PageResult;
 
+import java.util.List;
+
 /**
 * @author lxh专属坐骑
 * @description 针对表【sys_application】的数据库操作Service
@@ -14,7 +16,11 @@ public interface ApplicationService extends IService<Application> {
 
     //获取分页应用信息
     PageResult<Application> GetAllUpdateCfg(ApplicationReq req);
+    List<Application> GetAllUpdateCfgList(ApplicationReq req);
+    Application GetOne(ApplicationReq req);
 
     //新增应用信息
     String AddOrUpdateCfg(ApplicationReq req);
+
+
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/ApplicationServiceImpl.java

 package com.junmp.jyzb.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.jyzb.api.bean.query.ApplicationReq;
 import com.junmp.jyzb.api.exception.enums.CabinetExceptionEnum;
+import com.junmp.jyzb.api.exception.enums.PublicExceptionEnum;
 import com.junmp.jyzb.entity.Application;
 import com.junmp.jyzb.service.ApplicationService;
 import com.junmp.jyzb.mapper.ApplicationMapper;
@@ -17,6 +19,8 @@ import com.junmp.v2.db.api.factory.PageResultFactory;
 import com.junmp.v2.db.api.page.PageResult;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
 * @author lxh专属坐骑
 * @description 针对表【sys_application】的数据库操作Service实现
@@ -34,11 +38,34 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli
         return PageResultFactory.createPageResult(page);
     }
 
+    public List<Application> GetAllUpdateCfgList(ApplicationReq req) {
+        LambdaQueryWrapper<Application> wrapper = createWrapper(req);
+        list(wrapper);
+        return list(wrapper);
+    }
+    public Application GetOne(ApplicationReq req) {
+        LambdaQueryWrapper<Application> wrapper = createWrapper(req);
+        return getOne(wrapper);
+    }
+
     //新增应用信息
     @Override
     public String AddOrUpdateCfg(ApplicationReq req) {
         Application application = new Application();
         BeanPlusUtil.copyProperties(req,application);
+        List<Application> list = list(new LambdaQueryWrapper<Application>()
+                .eq(Application::getAppCode, req.getAppCode()).or().eq(Application::getName,req.getName()));
+        //判断应用代码和应用名称是否重复，如果重复直接抛出异常
+        if (CollectionUtil.isNotEmpty(list)){
+            for (Application app:list) {
+                if (app.getName().equals(req.getName())){
+                    throw new ServiceException(PublicExceptionEnum.APP_NAME_IS_EXIST);
+                }
+                if (app.getAppCode().equals(req.getAppCode())){
+                    throw new ServiceException(PublicExceptionEnum.APP_CODE_IS_EXIST);
+                }
+            }
+        }
         //判断id是否传递，如果传递则默认他是修改，根据数据库对比id，判断是否id传递错误；如果不传递默认新增
         if (req.getId()==null || req.getId().trim().isEmpty()){
             application.setCreateTime(DateTimeUtil.getCurrentDateTime());
@@ -63,6 +90,7 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli
         }
         wrapper.like(ObjectUtil.isNotEmpty(req.getName()),Application::getName,req.getName());
         wrapper.eq(ObjectUtil.isNotEmpty(req.getType()),Application::getType,req.getType());
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getAppCode()),Application::getAppCode,req.getAppCode());
         wrapper.orderByDesc(Application::getCreateTime);
         return wrapper;
 

jyzb-biz/src/main/resources/mapper/EquipmentCountSummaryMapper.xml

@@ -409,7 +409,7 @@
                 sum(vecs.number) as number
                 FROM vie_equipment_count_summary vecs
                 left join pub_org po on vecs.org_id_int=po.org_id
-                where vecs.`year`= #{year} and po.del_flag=1 AND (po.org_id = #{orgId} OR (`po`.org_parent_ids like  CONCAT('%', #{orgId}, '%')
+                where vecs.`year`= #{year} and po.del_flag=1 AND (po.org_id != #{orgId} and (`po`.org_parent_ids like  CONCAT('%', #{orgId}, '%')
                 AND(case when  #{levelFlag} >=3 then 1=1 else SUBSTRING(`po`.`org_code`, 5, 2) = '00' end ))
                 AND (
                 `po`.`level_flag` > (
@@ -443,6 +443,58 @@
                 ) AS t
             )as t2
     </select>
+
+
+    <select id="TjOrgCountSelf" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgCountDto">
+        select t1.org_id,t1.org_code,t1.org_name,t1.d_name,t2.year,t2.use_count,t2.fix_count,t2.number
+            FROM(
+                SELECT
+                `org_id`, `org_code`, `org_name`, `d_name`
+                FROM `pub_org`
+                WHERE org_id=#{orgId}
+            ) as t1
+            CROSS JOIN (
+                SELECT
+                MAX(t.`year`) AS `year`,
+                SUM(t.use_count) AS use_count,
+                SUM(t.fix_count) AS fix_count,
+                sum(CASE WHEN t.month = MONTH(CURRENT_DATE()) THEN t.number ELSE 0 END) AS number
+                FROM (
+                    SELECT
+                        vecs.`year`,
+                        vecs.`month`,
+                        SUM(vecs.use_count) AS use_count,
+                        SUM(vecs.fix_count) AS fix_count,
+                        sum(vecs.number) as number
+                        FROM vie_equipment_count_summary vecs
+                        left join pub_org po on vecs.org_id_int=po.org_id
+                        where vecs.`year`= #{year} and po.del_flag=1 AND po.org_id = #{orgId}
+                        <if test="typeIdsList!=null and typeIdsList.size() > 0">
+                            and vecs.type_id in
+                            <foreach collection="typeIdsList" item="item" open="(" separator="," close=")">
+                                #{item}
+                            </foreach>
+                        </if>
+                        <if test="typeParentId != null and typeParentId !=''">
+                            and vecs.type_parnet_id=#{typeParentId}
+                        </if>
+                        <if test="sizeNameList!=null and sizeNameList.size() > 0">
+                            AND
+                            <foreach collection="sizeNameList " item="item" open="(" separator="or" close=")">
+                                vecs.size_name like CONCAT('%', #{item}, '%')
+                            </foreach>
+                        </if>
+                        <if test="monthList != null and monthList.size()>0">
+                            and vecs.month in
+                            <foreach collection="monthList" item="item" open="(" separator="," close=")">
+                                #{item}
+                            </foreach>
+                        </if>
+                        GROUP BY `year`,month
+                    ) AS t
+            )as t2
+    </select>
+
     <select id="TjOrgCountTotalNum" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgCountDto">
         SELECT MAX( t.`year` ) AS `year`,SUM( t.use_count ) AS use_count,SUM( t.fix_count ) AS fix_count,
                size_id,size_name,type_id,type_name,
@@ -464,16 +516,28 @@
                 LEFT JOIN pub_org po ON vecs.org_id_int = po.org_id
                 WHERE
                     YEAR = #{year}
-                    and `po`.`del_flag` = 1 and (po.org_id=#{orgId} or (`po`.org_parent_ids like  CONCAT('%', #{orgId}, '%')
-                    <if test="levelNum !=0">
-                        AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
+                    and `po`.`del_flag` = 1
+                    <if test="level =null or level=''" >
+                        and (po.org_id =#{orgId} or (`po`.org_parent_ids like  CONCAT('%', #{orgId}, '%')
+                        <if test="levelNum !=0">
+                            AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
+                        </if>
+                        ))
+                        and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
+                        `po`.level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
+                    </if>
+                    <if test="level=1">
+                        and (po.org_id !=#{orgId} and (`po`.org_parent_ids like  CONCAT('%', #{orgId}, '%')
+                        <if test="levelNum !=0">
+                            AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
+                        </if>
+                        ))
+                        and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
+                        `po`.level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
+                    </if>
+                    <if test="level = 0 ">
+                        and po.org_id =#{orgId}
                     </if>
-                    ))
-                    AND (
-                    `po`.level_flag >(SELECT
-                    level_flag FROM pub_org WHERE org_id = #{orgId} )+ #{levelNum}
-                    OR `po`.level_flag =(SELECT level_flag FROM	pub_org WHERE org_id = #{orgId}
-                    ))
                 GROUP BY
                     `year`,MONTH,size_id,size_name,type_id,type_name
             ) AS t
@@ -482,4 +546,6 @@
         ORDER BY
             t.type_id,size_id
     </select>
+
+
 </mapper>

jyzb-biz/src/main/resources/mapper/InventorySummaryMapper.xml

@@ -497,13 +497,29 @@
                  LEFT JOIN `base_inventory_summary` `bis` ON `po`.`org_id` = `bis`.`org_id_int`
         WHERE
 
-            `po`.`del_flag` = 1 and (po.org_id!=#{orgId} and (`po`.org_parent_ids like  CONCAT('%', #{orgId}, '%')
-          <if test="levelNum !=0">
-              AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
+            `po`.`del_flag` = 1
+          <if test="level =null or level=''" >
+              and (po.org_id =#{orgId} or (`po`.org_parent_ids like  CONCAT('%', #{orgId}, '%')
+              <if test="levelNum !=0">
+                  AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
+              </if>
+              ))
+              and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
+              `po`.level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
           </if>
-        ))
-          and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
-               `po`.level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
+          <if test="level=1">
+              and (po.org_id !=#{orgId} and (`po`.org_parent_ids like  CONCAT('%', #{orgId}, '%')
+              <if test="levelNum !=0">
+                  AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
+              </if>
+              ))
+              and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
+              `po`.level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
+          </if>
+          <if test="level = 0 ">
+              and po.org_id =#{orgId}
+          </if>
+
         <if test="typeIdsList!=null and typeIdsList.size() > 0">
             AND type_id IN
             <foreach collection="typeIdsList " item="item" open="(" separator="," close=")">