Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/ESEquipmentInfo.java

@@ -186,13 +186,13 @@ public class ESEquipmentInfo {
     private String PRODUCE_UNIT_NAME;
 
     /**
-     * 使用单位统一信用代码
+     * 安改维单位统一信用代码
      */
     @Field(type = FieldType.Keyword)
     private String USC_UNIT_CREDIT_CODE;
 
     /**
-     * 使用单位统名称
+     * 安改维单位统名称
      */
     @Field(type = FieldType.Text)
     private String USC_UNIT_NAME;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java

@@ -675,7 +675,7 @@ public class CommonController extends BaseController {
     public ResponseModel<Object> permissionTreeV2(@RequestParam String menuAgent,
                                                   @RequestParam String permissionType,
                                                   @RequestParam(required = false) String path,
-                                                  @RequestBody JSONArray params) {
+                                                  @RequestParam JSONArray params) {
         return ResponseHelper.buildResponse(commonService.getPermissionTreeWithCompanyV2(menuAgent, permissionType, path, getSelectedOrgInfo().getCompany(), params));
     }
 

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/dto/TzsCustomFilterContentDto.java

 package com.yeejoin.amos.boot.module.statistics.api.dto;
 
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 
 /**
@@ -15,8 +16,8 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="TzsCustomFilterContentDto", description="用户保存的自定义筛选内容表")
-public class TzsCustomFilterContentDto  extends BaseDto {
+@ApiModel(value = "TzsCustomFilterContentDto", description = "用户保存的自定义筛选内容表")
+public class TzsCustomFilterContentDto extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
@@ -34,7 +35,7 @@ public class TzsCustomFilterContentDto  extends BaseDto {
     private String filterName;
 
     @ApiModelProperty(value = "筛选条件内容")
-    private String filterContent;
+    private Object filterContent;
 
     @ApiModelProperty(value = "创建人ID")
     private String createUserId;
@@ -43,6 +44,6 @@ public class TzsCustomFilterContentDto  extends BaseDto {
     private Date createTime;
 
     @ApiModelProperty(value = "筛选条件类型")
-    private Date filterType;
+    private String filterType;
 
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/entity/TzsCustomFilterContent.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import java.util.Date;
 
 /**
@@ -50,7 +51,7 @@ public class TzsCustomFilterContent extends BaseEntity {
      * 筛选条件内容
      */
 	@TableField("filter_content")
-    private String filterContent;
+    private Object filterContent;
 
     /**
      * 创建人ID
@@ -68,6 +69,6 @@ public class TzsCustomFilterContent extends BaseEntity {
      * 筛选条件类型
      */
 	@TableField("filter_type")
-    private Date filterType;
+    private String filterType;
 
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/TzsCustomFilterMapper.java

 package com.yeejoin.amos.boot.module.statistics.api.mapper;
 
-import com.yeejoin.amos.boot.module.statistics.api.entity.TzsCustomFilter;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.statistics.api.entity.TzsCustomFilter;
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 自定义筛选字段基础数据表 Mapper 接口
@@ -11,4 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface TzsCustomFilterMapper extends BaseMapper<TzsCustomFilter> {
 
+    @MapKey("key")
+    List<Map<String, Object>> selectEquipmentCategoryByParentId(@Param("parentId") String parentId);
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/TzsCustomFilterMapper.xml

@@ -2,4 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.statistics.api.mapper.TzsCustomFilterMapper">
 
+    <select id="selectEquipmentCategoryByParentId" resultType="java.util.Map">
+        select
+        id as key,
+        code as value,
+        name as label
+        from tz_equipment_category
+        where parent_id = #{parentId}
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/ComprehensiveStatisticalAnalysisController.java

+package com.yeejoin.amos.boot.module.statistcs.biz.controller;
+
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.ComprehensiveStatisticalAnalysisServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 综合统计分析API
+ *
+ * @author system_generator
+ * @date 2025-06-24
+ */
+@RestController
+@Api(tags = "综合统计分析API")
+@RequestMapping(value = "/comprehensiveStatisticalAnalysis")
+public class ComprehensiveStatisticalAnalysisController extends BaseController {
+
+    @Autowired
+    private ComprehensiveStatisticalAnalysisServiceImpl comprehensiveStatisticalAnalysisServiceImpl;
+
+    /**
+     * @param key 筛选key
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/equipmentCategory")
+    @ApiOperation(httpMethod = "GET", value = "查询设备分类", notes = "查询设备分类")
+    public ResponseModel<List<Map<String, Object>>> queryEquipmentCategory(@RequestParam(value = "key", required = false) String key) {
+        return ResponseHelper.buildResponse(comprehensiveStatisticalAnalysisServiceImpl.queryEquipmentCategory(key));
+    }
+
+
+}

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/TzsCustomFilterContentController.java

 package com.yeejoin.amos.boot.module.statistcs.biz.controller;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.statistcs.biz.service.ITzsCustomFilterContentService;
 import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.TzsCustomFilterContentServiceImpl;
 import com.yeejoin.amos.boot.module.statistics.api.dto.TzsCustomFilterContentDto;
+import com.yeejoin.amos.boot.module.statistics.api.entity.TzsCustomFilterContent;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +43,7 @@ public class TzsCustomFilterContentController extends BaseController {
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增用户保存的自定义筛选内容表", notes = "新增用户保存的自定义筛选内容表")
     public ResponseModel<TzsCustomFilterContentDto> save(@RequestBody TzsCustomFilterContentDto model) {
-	    model = tzsCustomFilterContentServiceImpl.createWithModel(model);
+        model = tzsCustomFilterContentService.save(model, getSelectedOrgInfo().getCompany());
         return ResponseHelper.buildResponse(model);
     }
 
@@ -56,7 +56,7 @@ public class TzsCustomFilterContentController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PutMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新用户保存的自定义筛选内容表", notes = "根据sequenceNbr更新用户保存的自定义筛选内容表")
-	public ResponseModel<TzsCustomFilterContentDto> updateBySequenceNbrTzsCustomFilterContent(@RequestBody TzsCustomFilterContentDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+    public ResponseModel<TzsCustomFilterContentDto> updateBySequenceNbrTzsCustomFilterContent(@RequestBody TzsCustomFilterContentDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
         model.setSequenceNbr(sequenceNbr);
         return ResponseHelper.buildResponse(tzsCustomFilterContentServiceImpl.updateWithModel(model));
     }
@@ -70,50 +70,23 @@ public class TzsCustomFilterContentController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除用户保存的自定义筛选内容表", notes = "根据sequenceNbr删除用户保存的自定义筛选内容表")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
         return ResponseHelper.buildResponse(tzsCustomFilterContentServiceImpl.removeById(sequenceNbr));
     }
 
     /**
-     * 根据sequenceNbr查询
+     * 根据filterType查询
      *
-	 * @param sequenceNbr  主键
+     * @param filterType 筛选类型
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个用户保存的自定义筛选内容表",  notes = "根据sequenceNbr查询单个用户保存的自定义筛选内容表")
-	public ResponseModel<TzsCustomFilterContentDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(tzsCustomFilterContentServiceImpl.queryBySeq(sequenceNbr));
+    @GetMapping(value = "/selectList")
+    @ApiOperation(httpMethod = "GET", value = "根据filterType查询单个用户保存的自定义筛选内容表", notes = "根据filterType查询单个用户保存的自定义筛选内容表")
+    public ResponseModel<List<TzsCustomFilterContent>> queryByFilterType(@RequestParam(value = "filterType") String filterType) {
+        return ResponseHelper.buildResponse(tzsCustomFilterContentServiceImpl.queryByFilterType(filterType));
     }
 
-	/**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "用户保存的自定义筛选内容表分页查询",  notes = "用户保存的自定义筛选内容表分页查询")
-	public ResponseModel<Page<TzsCustomFilterContentDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<TzsCustomFilterContentDto> page = new Page<TzsCustomFilterContentDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(tzsCustomFilterContentService.queryForTzsCustomFilterContentPage(page));
-	}
 
-	/**
-	 * 列表全部数据查询
-     *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "用户保存的自定义筛选内容表列表全部数据查询",   notes = "用户保存的自定义筛选内容表列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<TzsCustomFilterContentDto>> selectForList() {
-	    return ResponseHelper.buildResponse(tzsCustomFilterContentService.queryForTzsCustomFilterContentList());
-	}
+
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/ITzsCustomFilterContentService.java

 package com.yeejoin.amos.boot.module.statistcs.biz.service;
 
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.module.statistics.api.dto.TzsCustomFilterContentDto;
+import com.yeejoin.amos.boot.module.statistics.api.entity.TzsCustomFilterContent;
 
 import java.util.List;
 
@@ -13,13 +14,8 @@ import java.util.List;
  * @date 2025-06-24
  */
 public interface ITzsCustomFilterContentService {
-    /**
-     * 分页查询
-     */
-    Page<TzsCustomFilterContentDto> queryForTzsCustomFilterContentPage(Page<TzsCustomFilterContentDto> page);
 
-    /**
-     * 列表查询 示例
-     */
-    List<TzsCustomFilterContentDto> queryForTzsCustomFilterContentList();
+    TzsCustomFilterContentDto save(TzsCustomFilterContentDto model, CompanyBo company);
+
+    List<TzsCustomFilterContent> queryByFilterType(String filterType);
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ComprehensiveStatisticalAnalysisServiceImpl.java

+package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.statistcs.biz.utils.JsonUtils;
+import com.yeejoin.amos.boot.module.statistics.api.mapper.TzsCustomFilterMapper;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 综合统计分析服务实现类
+ *
+ * @author system_generator
+ * @date 2025-06-24
+ */
+@Service
+public class ComprehensiveStatisticalAnalysisServiceImpl {
+
+    @Value("classpath:/json/equipCategory.json")
+    private Resource equipCategory;
+
+    @Autowired
+    private TzsCustomFilterMapper tzsCustomFilterMapper;
+
+    public List<Map<String, Object>> queryEquipmentCategory(String key) {
+        List<Map<String, Object>> list;
+        Map<String, List<Map<String, Object>>> resourceJson = JsonUtils.getResourceJson(equipCategory);
+        if (key == null) {
+            list = resourceJson.get(EquipmentClassifityEnum.ZHTJFX.getCode());
+        } else {
+            list = tzsCustomFilterMapper.selectEquipmentCategoryByParentId(key);
+        }
+
+        return list;
+    }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/TzsCustomFilterContentServiceImpl.java

 package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
 
-import com.yeejoin.amos.boot.module.statistics.api.entity.TzsCustomFilterContent;
-import com.yeejoin.amos.boot.module.statistics.api.mapper.TzsCustomFilterContentMapper;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.module.statistcs.biz.service.ITzsCustomFilterContentService;
 import com.yeejoin.amos.boot.module.statistics.api.dto.TzsCustomFilterContentDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
+import com.yeejoin.amos.boot.module.statistics.api.entity.TzsCustomFilterContent;
+import com.yeejoin.amos.boot.module.statistics.api.mapper.TzsCustomFilterContentMapper;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -16,18 +21,23 @@ import java.util.List;
  * @date 2025-06-24
  */
 @Service
-public class TzsCustomFilterContentServiceImpl extends BaseService<TzsCustomFilterContentDto,TzsCustomFilterContent,TzsCustomFilterContentMapper> implements ITzsCustomFilterContentService {
-    /**
-     * 分页查询
-     */
-    public Page<TzsCustomFilterContentDto> queryForTzsCustomFilterContentPage(Page<TzsCustomFilterContentDto> page)   {
-        return this.queryForPage(page, null, false);
+public class TzsCustomFilterContentServiceImpl extends BaseService<TzsCustomFilterContentDto, TzsCustomFilterContent, TzsCustomFilterContentMapper> implements ITzsCustomFilterContentService {
+
+    @Override
+    public TzsCustomFilterContentDto save(TzsCustomFilterContentDto model, CompanyBo company) {
+        model.setOrgCode(company.getOrgCode());
+        model.setOrgName(company.getCompanyName());
+        model.setCreateUserId(RequestContext.getExeUserId());
+        model.setFilterContent(JSONObject.toJSONString(model.getFilterContent()));
+        model.setCreateTime(new Date());
+        return this.createWithModel(model);
     }
 
-    /**
-     * 列表查询 示例
-     */
-    public List<TzsCustomFilterContentDto> queryForTzsCustomFilterContentList()   {
-        return this.queryForList("" , false);
+    @Override
+    public List<TzsCustomFilterContent> queryByFilterType(String filterType) {
+        LambdaQueryWrapper<TzsCustomFilterContent> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TzsCustomFilterContent::getFilterType, filterType);
+        queryWrapper.eq(TzsCustomFilterContent::getCreateUserId, RequestContext.getExeUserId());
+        return this.lambdaQuery().getBaseMapper().selectList(queryWrapper);
     }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equipCategory.json

@@ -390,5 +390,48 @@
       "sum": "0",
       "type": "elevator"
     }
+  ],
+  "__statistical__": "综合统计分析筛选项使用",
+  "statistical": [
+    {
+      "key": "26",
+      "label": "电梯",
+      "value": "3000"
+    },
+    {
+      "key": "41",
+      "label": "起重机械",
+      "value": "4000"
+    },
+    {
+      "key": "1",
+      "label": "锅炉",
+      "value": "1000"
+    },
+    {
+      "key": "7",
+      "label": "压力容器",
+      "value": "2000"
+    },
+    {
+      "key": "133",
+      "label": "压力管道",
+      "value": "8000"
+    },
+    {
+      "key": "80",
+      "label": "大型游乐设施",
+      "value": "6000"
+    },
+    {
+      "key": "144",
+      "label": "客运索道",
+      "value": "9000"
+    },
+    {
+      "key": "76",
+      "label": "场（厂）内专用机动车辆",
+      "value": "5000"
+    }
   ]
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/EquipmentClassifityEnum.java

@@ -24,6 +24,8 @@ public enum EquipmentClassifityEnum {
     KYSD("客运索道", "9000"),
     //树类型
 
+    ZHTJFX("综合统计分析","statistical"),
+
     //设备认领状态
     SBRLZT("设备认领状态", "rlzt"),
     BDLS("八大类树", "eightCategory"),