Merge remote-tracking branch 'origin/dev-2.20.0' into dev

unis-plugin/unis-plugin-biz/src/main/java/com/unis/visualization/modular/grainOilReserve/controller/GrainOilReserveController.java

@@ -23,6 +23,7 @@ import com.unis.visualization.modular.grainOilReserve.entity.VO.GradeCapacityCha
 import com.unis.visualization.modular.grainOilReserve.entity.VO.RotationPlanChart;
 import com.unis.visualization.modular.grainOilReserve.entity.VO.StorehouseCapacityChart;
 import com.unis.visualization.modular.grainOilReserve.entity.VO.VarietyCapacityChart;
+import com.unis.visualization.modular.grainOilReserve.param.CityParam;
 import com.unis.visualization.modular.grainOilReserve.param.DepotStockParam;
 import com.unis.visualization.modular.grainOilReserve.param.GrainOilReserveParam;
 import com.unis.visualization.modular.grainOilReserve.service.GrainOilReserveService;
@@ -62,8 +63,8 @@ public class GrainOilReserveController {
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取仓容统计图表信息")
     @GetMapping("/visualization/grainOilReserve/getStorehouseChartDatas")
-    public CommonResult<StorehouseCapacityChart> getStorehouseChartDatas() {
-        return CommonResult.data(grainOilReserveService.getStorehouseChartDatas());
+    public CommonResult<StorehouseCapacityChart> getStorehouseChartDatas(@Valid CityParam param) {
+        return CommonResult.data(grainOilReserveService.getStorehouseChartDatas(param));
     }
 
     /**
@@ -75,8 +76,8 @@ public class GrainOilReserveController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("获取品种统计图表信息")
     @GetMapping("/visualization/grainOilReserve/getVarietyChartDatas")
-    public CommonResult<List<VarietyCapacityChart>> getVarietyChartDatas() {
-        return CommonResult.data(grainOilReserveService.getVarietyChartDatas());
+    public CommonResult<List<VarietyCapacityChart>> getVarietyChartDatas(@Valid CityParam param) {
+        return CommonResult.data(grainOilReserveService.getVarietyChartDatas(param));
     }
 
     /**
@@ -88,8 +89,8 @@ public class GrainOilReserveController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("获取等级统计图表信息")
     @GetMapping("/visualization/grainOilReserve/getGradeChartDatas")
-    public CommonResult<List<GradeCapacityChart>> getGradeChartDatas() {
-        return CommonResult.data(grainOilReserveService.getGradeChartDatas());
+    public CommonResult<List<GradeCapacityChart>> getGradeChartDatas(@Valid CityParam param) {
+        return CommonResult.data(grainOilReserveService.getGradeChartDatas(param));
     }
 
     /**
@@ -101,8 +102,8 @@ public class GrainOilReserveController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("获取各市州品种统计图表信息")
     @GetMapping("/visualization/grainOilReserve/getCityVarietyChartDatas")
-    public CommonResult<List<CityVarietyCapacityChart>> getCityVarietyChartDatas() {
-        return CommonResult.data(grainOilReserveService.getCityVarietyChartDatas());
+    public CommonResult<List<CityVarietyCapacityChart>> getCityVarietyChartDatas(@Valid CityParam param) {
+        return CommonResult.data(grainOilReserveService.getCityVarietyChartDatas(param));
     }
 
     /**

unis-plugin/unis-plugin-biz/src/main/java/com/unis/visualization/modular/grainOilReserve/mapper/GrainOilReserveMapper.java

@@ -35,38 +35,41 @@ public interface GrainOilReserveMapper  {
     /**
      * 仓房和油罐总容量
      * @return
+     * @param cityId
      */
-    StorehouseCapacityChart getStorehouseCapacity();
+    StorehouseCapacityChart getStorehouseCapacity(@Param("cityId") String cityId);
 
     /**
      * 得到原粮油总库存
      * @return
+     * @param cityId
      */
-    StorehouseCapacityChart getStorehouseStock();
+    StorehouseCapacityChart getStorehouseStock(@Param("cityId") String cityId);
 
-    List<VarietyCapacityChart> getVarietyChartDatas();
+    List<VarietyCapacityChart> getVarietyChartDatas(@Param("cityId") String cityId);
 
-    List<GradeCapacityChart> getGradeChartDatas();
+    List<GradeCapacityChart> getGradeChartDatas(@Param("cityId") String cityId);
 
-    List<CityVarietyCapacityChart> getCityVarietyChartDatas();
+    List<CityVarietyCapacityChart> getCityVarietyChartDatas(@Param("cityId") String cityId);
 
-    List<CurrentCrkCapacityChart> getCurrentCrkChartDatas(@Param("crkType") Integer crkType);
+    List<CurrentCrkCapacityChart> getCurrentCrkChartDatas(@Param("crkType") Integer crkType, @Param("cityId") String cityId);
 
     RotationPlanChart getRotationPalnChartDatas();
 
-    List<DeportStockChart> getDepotStockChartDatas(@Param("queryType")Integer queryType);
+    List<DeportStockChart> getDepotStockChartDatas(@Param("queryType") Integer queryType);
 
     DeportStockDetail getDepotStockDetail(@Param("orgId") Integer orgId);
 
-    DeportStockDetail getStorehouseDetail(@Param("orgId")Integer orgId);
+    DeportStockDetail getStorehouseDetail(@Param("orgId") Integer orgId);
 
-    DeportStockDetail getTankDetail(@Param("orgId")Integer orgId);
+    DeportStockDetail getTankDetail(@Param("orgId") Integer orgId);
 
-    List<StockDetail> getStockDetailList(@Param("orgId")Integer orgId);
+    List<StockDetail> getStockDetailList(@Param("orgId") Integer orgId);
 
     /**
      * 得到去年今日库存
      * @return
+     * @param cityId
      */
-    StorehouseCapacityChart getYesteryearStorehouseStock();
+    StorehouseCapacityChart getYesteryearStorehouseStock(@Param("cityId") String cityId);
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/visualization/modular/grainOilReserve/mapper/mapping/GrainOilReserveMapper.xml

@@ -3,34 +3,56 @@
 <mapper namespace="com.unis.visualization.modular.grainOilReserve.mapper.GrainOilReserveMapper">
 
     <select id="getStorehouseCapacity" resultType="com.unis.visualization.modular.grainOilReserve.entity.VO.StorehouseCapacityChart">
-       SELECT ROUND(SUM(designCapacity)/10000,3) as designCapacity FROM (
-        SELECT  SUM(IFNULL(a.design_capacity,0.0)) as  designCapacity  FROM depot_qh.basic_storehouse a where a.del_flag =1
+      SELECT ROUND(SUM(designCapacity)/10000,3) as designCapacity FROM (
+        SELECT  IFNULL(a.design_capacity,0.0) as  designCapacity,org_id as orgId  FROM depot_qh.basic_storehouse a where a.del_flag =1
         UNION ALL
-        SELECT  SUM(IFNULL(a.tank_capacity,0.0)) as  designCapacity  FROM depot_qh.basic_tank a where a.del_flag =1
+        SELECT  IFNULL(a.tank_capacity,0.0) as  designCapacity,org_id as orgId  FROM depot_qh.basic_tank a where a.del_flag =1
         ) x
+    LEFT JOIN depot_qh.org_info b on x.orgId = b.org_id
+    LEFT JOIN province_all.biz_unit_info c on b.unit_info_id = c.id
+        <if test="cityId != null and cityId != ''">
+            where c.zcdz_city = #{cityId}
+        </if>
     </select>
     <select id="getStorehouseStock" resultType="com.unis.visualization.modular.grainOilReserve.entity.VO.StorehouseCapacityChart">
       SELECT ROUND(IFNULL(SUM(kcsl),0.0)/1000/10000,3) as kcsl  FROM depot_qh.data_kcgl_kcsw_default a
+        LEFT JOIN depot_qh.org_info b on a.UnitID = b.org_id
+        LEFT JOIN province_all.biz_unit_info c on b.unit_info_id = c.id
+        <if test="cityId != null and cityId != ''">
+            where c.zcdz_city = #{cityId}
+        </if>
     </select>
     <select id="getYesteryearStorehouseStock" resultType="com.unis.visualization.modular.grainOilReserve.entity.VO.StorehouseCapacityChart">
-        SELECT ROUND(IFNULL(SUM(kcsl),0.0)/1000/10000,3) yesterYearKcsl
+         SELECT ROUND(IFNULL(SUM(kcsl),0.0)/1000/10000,3) yesterYearKcsl
         FROM (
-        SELECT *,
-        ROW_NUMBER() OVER (PARTITION BY hwh ORDER BY rq DESC) AS rn
-        FROM depot_qh.data_kcgl_fcbgz_default  where   DATE_FORMAT(DATE_ADD(NOW(),INTERVAL -1 YEAR),'%Y-%m-%d') >=  DATE_FORMAT(rq,'%Y-%m-%d')
+        SELECT a.kcsl,
+        ROW_NUMBER() OVER (PARTITION BY a.hwh ORDER BY a.rq DESC) AS rn
+        FROM depot_qh.data_kcgl_fcbgz_default a
+				LEFT JOIN depot_qh.org_info b on a.UnitID = b.org_id
+				LEFT JOIN province_all.biz_unit_info c on b.unit_info_id = c.id
+				where   DATE_FORMAT(DATE_ADD(NOW(),INTERVAL -1 YEAR),'%Y-%m-%d') >=  DATE_FORMAT(a.rq,'%Y-%m-%d')
+                <if test="cityId != null and cityId != ''">
+                   and c.zcdz_city = #{cityId}
+                </if>
         ) t
         WHERE rn = 1;
 
     </select>
     <select id="getVarietyChartDatas" resultType="com.unis.visualization.modular.grainOilReserve.entity.VO.VarietyCapacityChart">
         SELECT
-        a.pz ,
-        b.enumname pzName,
-        ROUND(IFNULL(SUM(kcsl),0.0)/1000/10000,3) as kcsl  FROM depot_qh.data_kcgl_kcsw_default a
-        LEFT JOIN depot_qh.basic_enum b on a.pz =  b.enumId
+            a.pz ,
+            e.enumname pzName,
+            ROUND(IFNULL(SUM(kcsl),0.0)/1000/10000,3) as kcsl
+        FROM depot_qh.data_kcgl_kcsw_default a
+        LEFT JOIN depot_qh.basic_enum e on a.pz =  e.enumId
+        LEFT JOIN depot_qh.org_info b on a.UnitID = b.org_id
+        LEFT JOIN province_all.biz_unit_info c on b.unit_info_id = c.id
+        <if test="cityId != null and cityId != ''">
+            where  c.zcdz_city = #{cityId}
+        </if>
         GROUP BY
         a.pz,
-        b.enumname
+        e.enumname
         ORDER BY a.pz
     </select>
     <select id="getGradeChartDatas" resultType="com.unis.visualization.modular.grainOilReserve.entity.VO.GradeCapacityChart">
@@ -47,7 +69,12 @@
         ROUND(IFNULL(SUM(kcsl),0.0)/1000/10000,3) as sumZl  FROM depot_qh.data_kcgl_kcsw_default a
         LEFT JOIN depot_qh.basic_enum b on a.pz =  b.enumId
         LEFT JOIN depot_qh.basic_enum c on a.dj =  c.enumId
+				LEFT JOIN depot_qh.org_info d on a.UnitID = d.org_id
+				LEFT JOIN province_all.biz_unit_info e on d.unit_info_id = e.id
         where a.dj in  (3271,3272,3273)
+        <if test="cityId != null and cityId != ''">
+            and  e.zcdz_city = #{cityId}
+        </if>
         GROUP by
         a.dj,a.pz
         ) x
@@ -79,6 +106,9 @@ ORDER  by pz
 		LEFT JOIN depot_qh.basic_enum e on e.enumId = a.pz
     where
 		d.PARENT_ID =  '1781535965870915586'
+        <if test="cityId != null and cityId != ''">
+            and  c.zcdz_city = #{cityId}
+        </if>
     GROUP BY
         d.ID,d.DICT_LABEL,a.pz,e.enumname
 ) x
@@ -100,7 +130,12 @@ ORDER  by pz
                 left JOIN  depot_qh.data_crkyw_ckcmz_default b ON a.BizNo = b.BizNo
                 LEFT JOIN depot_qh.data_crkyw_ckcm_default  c  on a.BizNo = c.BizNo
                 LEFT JOIN depot_qh.basic_enum d on a.lspz = d.enumId
+                LEFT JOIN depot_qh.org_info m1 on a.UnitID = m1.org_id
+                LEFT JOIN province_all.biz_unit_info m2 on m1.unit_info_id = m2.id
                 where DATE_FORMAT(a.rmsj,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
+                <if test="cityId != null and cityId != ''">
+                    and  m2.zcdz_city = #{cityId}
+                </if>
                 GROUP BY a.lspz,d.enumname
             </when >
             <otherwise >
@@ -115,7 +150,12 @@ ORDER  by pz
                 left JOIN  depot_qh.data_crkyw_cpz_default b ON a.BizNo = b.BizNo
                 LEFT JOIN depot_qh.data_crkyw_rkcm_default  c  on a.BizNo = c.BizNo
                 LEFT JOIN depot_qh.basic_enum d on a.lspz = d.enumId
+                LEFT JOIN depot_qh.org_info m1 on a.UnitID = m1.org_id
+                LEFT JOIN province_all.biz_unit_info m2 on m1.unit_info_id = m2.id
                 where DATE_FORMAT(a.ywdjsj,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
+                <if test="cityId != null and cityId != ''">
+                    and  m2.zcdz_city = #{cityId}
+                </if>
                 GROUP BY a.lspz,d.enumname
             </otherwise>
         </choose>

unis-plugin/unis-plugin-biz/src/main/java/com/unis/visualization/modular/grainOilReserve/param/CityParam.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright [2022] [https://www.xiaonuo.vip]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
+ * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
+ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
+ */
+package com.unis.visualization.modular.grainOilReserve.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 可视化-粮油储备市州过滤参数
+ *
+ * @author TS
+ * @date  2024/07/25 11:08
+ **/
+@Getter
+@Setter
+public class CityParam {
+
+
+    @ApiModelProperty(value = "市州Id", position = 1)
+    private String cityId;
+
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/visualization/modular/grainOilReserve/param/GrainOilReserveParam.java

@@ -32,4 +32,7 @@ public class GrainOilReserveParam {
     @ApiModelProperty(value = "出入库类型 3：入库，1：出库")
     private Integer crkType;
 
+    @ApiModelProperty(value = "市州Id", position = 2)
+    private String cityId;
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/visualization/modular/grainOilReserve/service/GrainOilReserveService.java

@@ -22,6 +22,7 @@ import com.unis.visualization.modular.grainOilReserve.entity.VO.GradeCapacityCha
 import com.unis.visualization.modular.grainOilReserve.entity.VO.RotationPlanChart;
 import com.unis.visualization.modular.grainOilReserve.entity.VO.StorehouseCapacityChart;
 import com.unis.visualization.modular.grainOilReserve.entity.VO.VarietyCapacityChart;
+import com.unis.visualization.modular.grainOilReserve.param.CityParam;
 import com.unis.visualization.modular.grainOilReserve.param.DepotStockParam;
 import com.unis.visualization.modular.grainOilReserve.param.GrainOilReserveParam;
 
@@ -39,26 +40,30 @@ public interface GrainOilReserveService  {
     /**
      * 获取仓容统计图表信息
      * @return
+     * @param param
      */
-    StorehouseCapacityChart getStorehouseChartDatas();
+    StorehouseCapacityChart getStorehouseChartDatas(CityParam param);
 
     /**
      * 获取品种统计图表信息
      * @return
+     * @param param
      */
-    List<VarietyCapacityChart> getVarietyChartDatas();
+    List<VarietyCapacityChart> getVarietyChartDatas(CityParam param);
 
     /**
      *获取等级统计图表信息
      * @return
+     * @param param
      */
-    List<GradeCapacityChart> getGradeChartDatas();
+    List<GradeCapacityChart> getGradeChartDatas(CityParam param);
 
     /**
      *获取各市州品种统计图表信息
      * @return
+     * @param param
      */
-    List<CityVarietyCapacityChart> getCityVarietyChartDatas();
+    List<CityVarietyCapacityChart> getCityVarietyChartDatas(CityParam param);
 
     /**
      * 获取当日出入库统计图表信息

unis-plugin/unis-plugin-biz/src/main/java/com/unis/visualization/modular/grainOilReserve/service/impl/GrainOilReserveServiceImpl.java

@@ -23,6 +23,7 @@ import com.unis.visualization.modular.grainOilReserve.entity.VO.StockDetail;
 import com.unis.visualization.modular.grainOilReserve.entity.VO.StorehouseCapacityChart;
 import com.unis.visualization.modular.grainOilReserve.entity.VO.VarietyCapacityChart;
 import com.unis.visualization.modular.grainOilReserve.mapper.GrainOilReserveMapper;
+import com.unis.visualization.modular.grainOilReserve.param.CityParam;
 import com.unis.visualization.modular.grainOilReserve.param.DepotStockParam;
 import com.unis.visualization.modular.grainOilReserve.param.GrainOilReserveParam;
 import com.unis.visualization.modular.grainOilReserve.service.GrainOilReserveService;
@@ -47,13 +48,22 @@ public class GrainOilReserveServiceImpl  implements GrainOilReserveService {
      * 获取仓容统计图表信息
      *
      * @return
+     * @param param
      */
     @Override
-    public StorehouseCapacityChart getStorehouseChartDatas() {
+    public StorehouseCapacityChart getStorehouseChartDatas(CityParam param) {
         //得到总库容 单位：万吨
-        StorehouseCapacityChart chart =grainOilReserveMapper.getStorehouseCapacity();
+        StorehouseCapacityChart chart =grainOilReserveMapper.getStorehouseCapacity(param.getCityId());
+        if (chart == null){
+            chart = new StorehouseCapacityChart();
+            chart.setDesignCapacity(BigDecimal.ZERO);
+        }
         //总库存 单位：万吨
-        StorehouseCapacityChart kcslChart =grainOilReserveMapper.getStorehouseStock();
+        StorehouseCapacityChart kcslChart =grainOilReserveMapper.getStorehouseStock(param.getCityId());
+        if (kcslChart == null){
+            kcslChart = new StorehouseCapacityChart();
+            kcslChart.setKcsl(0.0);
+        }
         BigDecimal  designCapacity = chart.getDesignCapacity();
         Double kcsl = kcslChart.getKcsl();
         chart.setKcsl(kcsl);
@@ -61,10 +71,14 @@ public class GrainOilReserveServiceImpl  implements GrainOilReserveService {
         BigDecimal actualNoneCapacity =NumberUtil.sub(designCapacity,kcsl);
         chart.setActualNoneCapacity(actualNoneCapacity);
         //得到仓容比例
-        BigDecimal capacityRate = NumberUtil.mul(NumberUtil.div(kcsl,designCapacity),100);
+        BigDecimal capacityRate = designCapacity.doubleValue()==0.0?BigDecimal.ZERO:NumberUtil.mul(NumberUtil.div(kcsl,designCapacity),100);
         chart.setCapacityRate(capacityRate);
         //得到去年今日库存
-        StorehouseCapacityChart yesterYearKcslChart =grainOilReserveMapper.getYesteryearStorehouseStock();
+        StorehouseCapacityChart yesterYearKcslChart =grainOilReserveMapper.getYesteryearStorehouseStock(param.getCityId());
+        if (yesterYearKcslChart !=null){
+            yesterYearKcslChart = new StorehouseCapacityChart();
+            yesterYearKcslChart.setYesterYearKcsl(0.0);
+        }
         Double yesterYearKcsl = yesterYearKcslChart.getYesterYearKcsl();
         //在计算同比增长率时，如果分母为0，会产生无穷大的结果。为避免这种情况，可以将上期数据设定一个极小值，例如0.001，以确保计算结果的可靠性
         if (yesterYearKcsl == 0.0){
@@ -82,30 +96,33 @@ public class GrainOilReserveServiceImpl  implements GrainOilReserveService {
      * 获取品种统计图表信息
      *
      * @return
+     * @param param
      */
     @Override
-    public List<VarietyCapacityChart> getVarietyChartDatas() {
-        return grainOilReserveMapper.getVarietyChartDatas();
+    public List<VarietyCapacityChart> getVarietyChartDatas(CityParam param) {
+        return grainOilReserveMapper.getVarietyChartDatas(param.getCityId());
     }
 
     /**
      * 获取等级统计图表信息
      *
      * @return
+     * @param param
      */
     @Override
-    public List<GradeCapacityChart> getGradeChartDatas() {
-        return grainOilReserveMapper.getGradeChartDatas();
+    public List<GradeCapacityChart> getGradeChartDatas(CityParam param) {
+        return grainOilReserveMapper.getGradeChartDatas(param.getCityId());
     }
 
     /**
      * 获取各市州品种统计图表信息
      *
      * @return
+     * @param param
      */
     @Override
-    public List<CityVarietyCapacityChart> getCityVarietyChartDatas() {
-        return grainOilReserveMapper.getCityVarietyChartDatas();
+    public List<CityVarietyCapacityChart> getCityVarietyChartDatas(CityParam param) {
+        return grainOilReserveMapper.getCityVarietyChartDatas(param.getCityId());
     }
 
     /**
@@ -116,7 +133,7 @@ public class GrainOilReserveServiceImpl  implements GrainOilReserveService {
      */
     @Override
     public List<CurrentCrkCapacityChart> getCurrentCrkChartDatas(GrainOilReserveParam param) {
-        return grainOilReserveMapper.getCurrentCrkChartDatas(param.getCrkType());
+        return grainOilReserveMapper.getCurrentCrkChartDatas(param.getCrkType(),param.getCityId());
     }
 
     /**