房屋信息、统计信息下拉框组件

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/policy/IcPolicyItemResultDTO.java

@@ -0,0 +1,79 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-19
+ */
+@Data
+public class IcPolicyItemResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    private String id;
+
+    /**
+     *
+     */
+    private String customerId;
+
+    /**
+     * house:房屋信息，stat:统计信息
+     */
+    private String groupType;
+
+    /**
+     * 选项名；例如：房屋类型，房屋状态，人均收入
+     */
+    private String label;
+
+    /**
+     * 表名
+     */
+    private String tableName;
+
+    /**
+     * 房屋信息存储列名；统计信息定义好key放在这里
+     */
+    private String colKey;
+
+    /**
+     *
+     */
+    private String itemType;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 值来源;需要接口获取：remote。
+     */
+    private String optionSourceType;
+
+    /**
+     * 动态url；
+     */
+    private String optionSourceUrl;
+
+    /**
+     * 动态url的入参；存储json串
+     */
+    private String optionSourceParam;
+
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyCategoryController.java

@@ -1,73 +0,0 @@
-package com.epmet.controller;
-
-import com.epmet.commons.tools.aop.NoRepeatSubmit;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.ExcelUtils;
-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.dto.IcPolicyCategoryDTO;
-import com.epmet.service.IcPolicyCategoryService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * 政策匹配资源类型
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2022-07-18
- */
-@RestController
-@RequestMapping("icPolicyCategory")
-public class IcPolicyCategoryController {
-
-    @Autowired
-    private IcPolicyCategoryService icPolicyCategoryService;
-
-    @RequestMapping("page")
-    public Result<PageData<IcPolicyCategoryDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IcPolicyCategoryDTO> page = icPolicyCategoryService.page(params);
-        return new Result<PageData<IcPolicyCategoryDTO>>().ok(page);
-    }
-
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
-    public Result<IcPolicyCategoryDTO> get(@PathVariable("id") String id){
-        IcPolicyCategoryDTO data = icPolicyCategoryService.get(id);
-        return new Result<IcPolicyCategoryDTO>().ok(data);
-    }
-
-    @NoRepeatSubmit
-    @PostMapping("save")
-    public Result save(@RequestBody IcPolicyCategoryDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        icPolicyCategoryService.save(dto);
-        return new Result();
-    }
-
-    @NoRepeatSubmit
-    @PostMapping("update")
-    public Result update(@RequestBody IcPolicyCategoryDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        icPolicyCategoryService.update(dto);
-        return new Result();
-    }
-
-    @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        icPolicyCategoryService.delete(ids);
-        return new Result();
-    }
-
-}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java

@@ -1,19 +1,12 @@
 package com.epmet.controller;
 
-import com.epmet.commons.tools.aop.NoRepeatSubmit;
-import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.dto.IcPolicyItemResultDTO;
-import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.DefaultGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
-import com.epmet.dto.IcPolicyDTO;
 import com.epmet.service.IcPolicyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Map;
+import java.util.List;
 
 
 /**
@@ -23,48 +16,22 @@ import java.util.Map;
  * @since v1.0.0 2022-07-18
  */
 @RestController
-@RequestMapping("icPolicy")
+@RequestMapping("policy")
 public class IcPolicyController {
 
     @Autowired
     private IcPolicyService icPolicyService;
 
-    @RequestMapping("page")
+    /**
-    public Result<PageData<IcPolicyDTO>> page(@RequestParam Map<String, Object> params){
+     * 房屋信息、统计信息查询有哪些可选项
-        PageData<IcPolicyDTO> page = icPolicyService.page(params);
+     * @param customerId
-        return new Result<PageData<IcPolicyDTO>>().ok(page);
+     * @param groupType
-    }
+     * @return
-
+     */
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    @PostMapping("item-list/{groupType}")
-    public Result<IcPolicyDTO> get(@PathVariable("id") String id){
+    public Result<List<IcPolicyItemResultDTO>> itemList(@RequestHeader("customerId") String customerId, @PathVariable("groupType") String groupType) {
-        IcPolicyDTO data = icPolicyService.get(id);
+        List<IcPolicyItemResultDTO> list = icPolicyService.itemList(customerId, groupType);
-        return new Result<IcPolicyDTO>().ok(data);
+        return new Result<List<IcPolicyItemResultDTO>>().ok(list);
-    }
-
-    @NoRepeatSubmit
-    @PostMapping("save")
-    public Result save(@RequestBody IcPolicyDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        icPolicyService.save(dto);
-        return new Result();
-    }
-
-    @NoRepeatSubmit
-    @PostMapping("update")
-    public Result update(@RequestBody IcPolicyDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        icPolicyService.update(dto);
-        return new Result();
-    }
-
-    @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        icPolicyService.delete(ids);
-        return new Result();
     }
 
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyRuleController.java

@@ -1,70 +0,0 @@
-package com.epmet.controller;
-
-import com.epmet.commons.tools.aop.NoRepeatSubmit;
-import com.epmet.commons.tools.page.PageData;
-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.DefaultGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
-import com.epmet.dto.IcPolicyRuleDTO;
-import com.epmet.service.IcPolicyRuleService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-
-/**
- * 政策匹配规则
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2022-07-18
- */
-@RestController
-@RequestMapping("icPolicyRule")
-public class IcPolicyRuleController {
-
-    @Autowired
-    private IcPolicyRuleService icPolicyRuleService;
-
-    @RequestMapping("page")
-    public Result<PageData<IcPolicyRuleDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IcPolicyRuleDTO> page = icPolicyRuleService.page(params);
-        return new Result<PageData<IcPolicyRuleDTO>>().ok(page);
-    }
-
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
-    public Result<IcPolicyRuleDTO> get(@PathVariable("id") String id){
-        IcPolicyRuleDTO data = icPolicyRuleService.get(id);
-        return new Result<IcPolicyRuleDTO>().ok(data);
-    }
-
-    @NoRepeatSubmit
-    @PostMapping("save")
-    public Result save(@RequestBody IcPolicyRuleDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        icPolicyRuleService.save(dto);
-        return new Result();
-    }
-
-    @NoRepeatSubmit
-    @PostMapping("update")
-    public Result update(@RequestBody IcPolicyRuleDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        icPolicyRuleService.update(dto);
-        return new Result();
-    }
-
-    @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        icPolicyRuleService.delete(ids);
-        return new Result();
-    }
-
-}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyRuleDetailController.java

@@ -1,70 +0,0 @@
-package com.epmet.controller;
-
-import com.epmet.commons.tools.aop.NoRepeatSubmit;
-import com.epmet.commons.tools.page.PageData;
-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.dto.IcPolicyRuleDetailDTO;
-import com.epmet.service.IcPolicyRuleDetailService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-
-/**
- * 政策匹配规则明细
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2022-07-18
- */
-@RestController
-@RequestMapping("icPolicyRuleDetail")
-public class IcPolicyRuleDetailController {
-
-    @Autowired
-    private IcPolicyRuleDetailService icPolicyRuleDetailService;
-
-    @RequestMapping("page")
-    public Result<PageData<IcPolicyRuleDetailDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IcPolicyRuleDetailDTO> page = icPolicyRuleDetailService.page(params);
-        return new Result<PageData<IcPolicyRuleDetailDTO>>().ok(page);
-    }
-
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
-    public Result<IcPolicyRuleDetailDTO> get(@PathVariable("id") String id){
-        IcPolicyRuleDetailDTO data = icPolicyRuleDetailService.get(id);
-        return new Result<IcPolicyRuleDetailDTO>().ok(data);
-    }
-
-    @NoRepeatSubmit
-    @PostMapping("save")
-    public Result save(@RequestBody IcPolicyRuleDetailDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        icPolicyRuleDetailService.save(dto);
-        return new Result();
-    }
-
-    @NoRepeatSubmit
-    @PostMapping("update")
-    public Result update(@RequestBody IcPolicyRuleDetailDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        icPolicyRuleDetailService.update(dto);
-        return new Result();
-    }
-
-    @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        icPolicyRuleDetailService.delete(ids);
-        return new Result();
-    }
-
-}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyDao.java

@@ -1,8 +1,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.IcPolicyItemResultDTO;
 import com.epmet.entity.IcPolicyEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 政策表
@@ -12,5 +16,12 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IcPolicyDao extends BaseDao<IcPolicyEntity> {
-	
+
+    /**
+     * 房屋信息、统计信息查询有哪些可选项
+     * @param customerId
+     * @param groupType
+     * @return
+     */
+    List<IcPolicyItemResultDTO> selectItemList(@Param("customerId") String customerId, @Param("groupType") String groupType);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java

@@ -1,12 +1,10 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IcPolicyItemResultDTO;
-import com.epmet.dto.IcPolicyDTO;
 import com.epmet.entity.IcPolicyEntity;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 政策表
@@ -15,64 +13,11 @@ import java.util.Map;
  * @since v1.0.0 2022-07-18
  */
 public interface IcPolicyService extends BaseService<IcPolicyEntity> {
-
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<IcPolicyDTO>
-     * @author generator
-     * @date 2022-07-18
-     */
-    PageData<IcPolicyDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<IcPolicyDTO>
-     * @author generator
-     * @date 2022-07-18
-     */
-    List<IcPolicyDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return IcPolicyDTO
-     * @author generator
-     * @date 2022-07-18
-     */
-    IcPolicyDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2022-07-18
-     */
-    void save(IcPolicyDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2022-07-18
-     */
-    void update(IcPolicyDTO dto);
-
     /**
-     * 批量删除
+     * 房屋信息、统计信息查询有哪些可选项
-     *
+     * @param customerId
-     * @param ids
+     * @param groupType
-     * @return void
+     * @return
-     * @author generator
-     * @date 2022-07-18
      */
-    void delete(String[] ids);
+    List<IcPolicyItemResultDTO> itemList(String customerId, String groupType);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java

@@ -1,22 +1,17 @@
 package com.epmet.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.Constant;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.IcPolicyDao;
-import com.epmet.dto.IcPolicyDTO;
+import com.epmet.dto.IcPolicyItemResultDTO;
 import com.epmet.entity.IcPolicyEntity;
 import com.epmet.service.IcPolicyService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 政策表
@@ -27,56 +22,23 @@ import java.util.Map;
 @Service
 public class IcPolicyServiceImpl extends BaseServiceImpl<IcPolicyDao, IcPolicyEntity> implements IcPolicyService {
 
-    @Override
-    public PageData<IcPolicyDTO> page(Map<String, Object> params) {
-        IPage<IcPolicyEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, IcPolicyDTO.class);
-    }
-
-    @Override
-    public List<IcPolicyDTO> list(Map<String, Object> params) {
-        List<IcPolicyEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, IcPolicyDTO.class);
-    }
-
-    private QueryWrapper<IcPolicyEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<IcPolicyEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
 
+    /**
+     * 房屋信息、统计信息查询有哪些可选项
+     *
+     * @param customerId
+     * @param groupType
+     * @return
+     */
     @Override
-    public IcPolicyDTO get(String id) {
+    public List<IcPolicyItemResultDTO> itemList(String customerId, String groupType) {
-        IcPolicyEntity entity = baseDao.selectById(id);
+        if(StringUtils.isBlank(groupType)){
-        return ConvertUtils.sourceToTarget(entity, IcPolicyDTO.class);
+            return new ArrayList<>();
+        }
+        List<IcPolicyItemResultDTO> resultList=baseDao.selectItemList(customerId,groupType);
+        if(CollectionUtils.isEmpty(resultList)){
+            return baseDao.selectItemList(Constant.DEFAULT_CUSTOMER,groupType);
+        }
+        return resultList;
     }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(IcPolicyDTO dto) {
-        IcPolicyEntity entity = ConvertUtils.sourceToTarget(dto, IcPolicyEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(IcPolicyDTO dto) {
-        IcPolicyEntity entity = ConvertUtils.sourceToTarget(dto, IcPolicyEntity.class);
-        updateById(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
-    }
-
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyDao.xml

@@ -21,5 +21,25 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-
+    <select id="selectItemList" parameterType="map" resultType="com.epmet.dto.IcPolicyItemResultDTO">
+        SELECT
+            i.id,
+            i.GROUP_TYPE,
+            i.LABEL,
+            i.COL_KEY,
+            i.ITEM_TYPE,
+            IFNULL( i.TABLE_NAME, '' ) AS TABLE_NAME,
+            i.sort,
+            IFNULL(i.remark,'')as remark,
+            IFNULL(i.option_source_type,'') as option_source_type,
+            IFNULL(i.option_source_url,'') as option_source_url,
+            IFNULL(i.option_source_param ,'') as option_source_param
+        FROM
+            ic_policy_item i
+        WHERE
+            i.DEL_FLAG = '0'
+          and i.CUSTOMER_ID = #{customerId}
+          and i.GROUP_TYPE = #{groupType}
+        order by i.SORT asc
+    </select>
 </mapper>