diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/DataSourceMainController.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/DataSourceMainController.java index 085d1ed63a64469f185c3d44ea6333615e672717..a9e4383948262f576e9ca10dee5a0f26bfff950e 100644 --- a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/DataSourceMainController.java +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/DataSourceMainController.java @@ -31,7 +31,7 @@ public class DataSourceMainController { @Autowired private DataSourceMainService dataSourceMainService; - @ApiOperation(value = "根据名字关键字或者四种排序方式或者标签类型进行列表分页") + @ApiOperation(value = "根据名字关键字或者四种排序方式或者标签类型查看数据源列表分页") @PostMapping(value = "/searchDataSourceMainlist",produces = "application/json;charset=UTF-8") public ResultBean searchDataSourceMainlist(@ApiParam(name = "pageNum", value = "页码", required = true, defaultValue = "1")@RequestParam(name = "pageNum", defaultValue = "1") int pageNum, @ApiParam(name = "pageSize", value = "每页条数", required = true, defaultValue = "10")@RequestParam(name = "pageSize", defaultValue = "10") int pageSize, diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/DimensionMainController.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/DimensionMainController.java index 6c6a573d1071332054e722ff5c4a799e5f24068e..1b3d4505670def73d743dc6b594d46df1f9334b7 100644 --- a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/DimensionMainController.java +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/DimensionMainController.java @@ -44,11 +44,14 @@ public class DimensionMainController { return ResultBean.success(dimensionMain); } - @ApiOperation(value = "新增/修改数据") - @PostMapping(value = "/saveAndUpdate", produces = "application/json;charset=UTF-8") - public ResultBean saveAndUpdate(@ApiParam(name = "dimensionMain", value = "DimensionMain", required = true)@RequestBody DimensionMain dimensionMain){ - dimensionMainService.saveOrUpdate(dimensionMain); - return ResultBean.success(); + @ApiOperation(value = "创建维度") + @PostMapping(value = "/createDimension", produces = "application/json;charset=UTF-8") + public ResultBean createDimension(@ApiParam(name = "modelId", value = "模型id", required = true)@RequestParam("modelId") String modelId, + @ApiParam(name = "dimensionName", value = "维度名称", required = true)@RequestParam("dimensionName") String dimensionName, + @ApiParam(name = "parentId", value = "父亲指标id:本身为父亲,此字段不填", required = false)@RequestParam(name = "parentId",required = false) String parentId, + @ApiParam(name = "path", value = "关系路径", required = true)@RequestParam("path") String path, + @ApiParam(name = "level", value = "级别1-3", required = true)@RequestParam("level") String level){ + return dimensionMainService.createDimension(modelId,dimensionName,parentId,path,level); } @ApiOperation(value = "删除数据") diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/InspectionObjectController.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/InspectionObjectController.java index 30ef5dab4abc03f15c88a68ddcfe5aaff4f286c4..49645cd8529f7562335139150d6dd598c7e10af2 100644 --- a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/InspectionObjectController.java +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/InspectionObjectController.java @@ -2,6 +2,7 @@ package com.hncy.zhpj.web.biz.controller; import com.hncy.zhpj.web.biz.entity.InspectionObject; import com.hncy.zhpj.web.biz.service.InspectionObjectService; +import com.hncy.zhpj.web.biz.vo.InspectionObjectVo; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import com.hncy.common.dto.ResultBean; @@ -44,11 +45,10 @@ public class InspectionObjectController { return ResultBean.success(inspectionObject); } - @ApiOperation(value = "新增/修改数据") - @PostMapping(value = "/saveAndUpdate", produces = "application/json;charset=UTF-8") - public ResultBean saveAndUpdate(@ApiParam(name = "inspectionObject", value = "InspectionObject", required = true)@RequestBody InspectionObject inspectionObject){ - inspectionObjectService.saveOrUpdate(inspectionObject); - return ResultBean.success(); + @ApiOperation(value = "创建检查对象") + @PostMapping(value = "/creatInspectionObject", produces = "application/json;charset=UTF-8") + public ResultBean creatInspectionObject(@ApiParam(name = "InspectionObjectVo", value = "创建检查对象vo", required = true)@RequestBody InspectionObjectVo inspectionObjectVo){ + return inspectionObjectService.creatInspectionObject(inspectionObjectVo); } @ApiOperation(value = "删除数据") diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/ModelMainController.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/ModelMainController.java index 0abe0239aa1ecee42d5e8fe0bde53aae02750701..c2cc3503b333c1ff246c001ce849151397c4b242 100644 --- a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/ModelMainController.java +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/ModelMainController.java @@ -57,4 +57,17 @@ public class ModelMainController { modelMainService.removeByIds(ids); return ResultBean.success(); } + + + @ApiOperation(value = "创建评价模型") + @GetMapping(value = "/creatModel",produces = "application/json;charset=UTF-8") + public ResultBean creatModel(@ApiParam(name = "code", value = "模型编号", required = true)@RequestParam("code") String code, + @ApiParam(name = "modelName", value = "模型名称", required = true)@RequestParam("modelName") String modelName, + @ApiParam(name = "period", value = "评价周期 1:年评;2:季评;3:月评", required = true)@RequestParam("period") String period, + @ApiParam(name = "description", value = "模型描述", required = true)@RequestParam("description") String description, + @ApiParam(name = "cover", value = "模型封面id", required = true)@RequestParam("cover") String cover){ + return modelMainService.creatModel(code,modelName,period,description,cover); + } + + } diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/ModelRelationController.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/ModelRelationController.java new file mode 100644 index 0000000000000000000000000000000000000000..7e90add864efec523cf0ac98507967507d17f284 --- /dev/null +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/ModelRelationController.java @@ -0,0 +1,60 @@ +package com.hncy.zhpj.web.biz.controller; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; +import com.hncy.common.dto.ResultBean; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.hncy.zhpj.web.biz.entity.ModelRelation; +import com.hncy.zhpj.web.biz.service.ModelRelationService; +import org.springframework.beans.factory.annotation.Autowired; +import io.swagger.annotations.Api; +import java.util.List; + +import org.springframework.web.bind.annotation.RestController; + +/** +*

+ * 模型关联表controller + *

+* +* @author cs +* @since 2021-09-22 +*/ +@RestController +@RequestMapping("//model-relation") +@Slf4j +@Api(tags = "模型关联表") +public class ModelRelationController { + + @Autowired + private ModelRelationService modelRelationService; + + @ApiOperation(value = "查询分页数据") + @PostMapping(value = "/pagelist",produces = "application/json;charset=UTF-8") + public ResultBean findListByPage(@ApiParam(name = "pageNum", value = "页码", required = true, defaultValue = "1")@RequestParam(name = "pageNum", defaultValue = "1") int pageNum, + @ApiParam(name = "pageSize", value = "每页条数", required = true, defaultValue = "10")@RequestParam(name = "pageSize", defaultValue = "10") int pageSize){ + return null; + } + + @ApiOperation(value = "根据id查询数据") + @GetMapping(value = "/getById",produces = "application/json;charset=UTF-8") + public ResultBean getById(@ApiParam(name = "id", value = "id", required = true)@RequestParam("id") String id){ + ModelRelation modelRelation = modelRelationService.getById(id); + return ResultBean.success(modelRelation); + } + + @ApiOperation(value = "新增/修改数据") + @PostMapping(value = "/saveAndUpdate", produces = "application/json;charset=UTF-8") + public ResultBean saveAndUpdate(@ApiParam(name = "modelRelation", value = "ModelRelation", required = true)@RequestBody ModelRelation modelRelation){ + modelRelationService.saveOrUpdate(modelRelation); + return ResultBean.success(); + } + + @ApiOperation(value = "删除数据") + @DeleteMapping(value = "/delByIds") + public ResultBean delete(@ApiParam(name = "ids", value = "ID集合", required = true)@RequestParam("ids") List ids){ + modelRelationService.removeByIds(ids); + return ResultBean.success(); + } +} diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/QuotaMainController.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/QuotaMainController.java index e43532e44ce9e62b59b1fb544f98330154ca7454..a8cae3bcd89e40f646958fc0092a6951e138823f 100644 --- a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/QuotaMainController.java +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/QuotaMainController.java @@ -30,18 +30,35 @@ public class QuotaMainController { @Autowired private QuotaMainService quotaMainService; - @ApiOperation(value = "查询分页数据") - @PostMapping(value = "/pagelist",produces = "application/json;charset=UTF-8") - public ResultBean findListByPage(@ApiParam(name = "pageNum", value = "页码", required = true, defaultValue = "1")@RequestParam(name = "pageNum", defaultValue = "1") int pageNum, - @ApiParam(name = "pageSize", value = "每页条数", required = true, defaultValue = "10")@RequestParam(name = "pageSize", defaultValue = "10") int pageSize){ - return null; + @ApiOperation(value = "根据名字关键字或者四种排序方式或者标签类型查看评价指标列表分页") + @PostMapping(value = "/searchQuotaMainlist",produces = "application/json;charset=UTF-8") + public ResultBean searchQuotaMainlist(@ApiParam(name = "pageNum", value = "页码", required = true, defaultValue = "1")@RequestParam(name = "pageNum", defaultValue = "1") int pageNum, + @ApiParam(name = "pageSize", value = "每页条数", required = true, defaultValue = "10")@RequestParam(name = "pageSize", defaultValue = "10") int pageSize, + @ApiParam(name = "nameKeyword", value = "名称关键字", required = false)@RequestParam(name = "nameKeyword",required = false) String nameKeyword, + @ApiParam(name = "orderType", value = "排序方式,1:时间正序,2:时间反序,3:评价指标名称首字母A-Z,4:评价指标名称首字母Z-A", required = false)@RequestParam(name = "orderType",required = false) String orderType, + @ApiParam(name = "tagIds", value = "标签ids", required = false)@RequestParam(name = "tagIds",required = false) List tagIds){ + return quotaMainService.searchQuotaMainlist(pageNum,pageSize,nameKeyword,orderType,tagIds); } - @ApiOperation(value = "根据id查询数据") - @GetMapping(value = "/getById",produces = "application/json;charset=UTF-8") - public ResultBean getById(@ApiParam(name = "id", value = "id", required = true)@RequestParam("id") String id){ - QuotaMain quotaMain = quotaMainService.getById(id); - return ResultBean.success(quotaMain); + @ApiOperation(value = "创建评价指标") + @GetMapping(value = "/creatQuotaMain",produces = "application/json;charset=UTF-8") + public ResultBean creatQuotaMain(@ApiParam(name = "quotaName", value = "指标名称", required = true)@RequestParam("quotaName") String quotaName, + @ApiParam(name = "type", value = "类型:1、统计型;2、现场检查型;3、满意度调查型、4、大数据分析型", required = true)@RequestParam("type") String type, + @ApiParam(name = "unitType", value = "单位类型:1:% 2:其他,单位不参与公式运算,如果是%返回的值需要做一个百分比转换", required = false)@RequestParam(name = "unitType", required = false) String unitType, + @ApiParam(name = "unit", value = "单位:类型为2时无效;单位不参与公式运算", required = false)@RequestParam(name = "unit", required = false) String unit, + @ApiParam(name = "tagId", value = "指标标签id", required = true)@RequestParam("tagId") String tagId, + @ApiParam(name = "interpretation", value = "指标解释", required = true)@RequestParam("interpretation") String interpretation, + @ApiParam(name = "icon", value = "指标图标:url", required = true)@RequestParam("icon") String icon, + @ApiParam(name = "detail", value = "数据详情", required = true)@RequestParam("detail") String detail, + @ApiParam(name = "isSingle", value = "是否单指标:0:false; 1:true", required = true)@RequestParam("isSingle") String isSingle, + @ApiParam(name = "parentId", value = "父亲指标id:本身为父亲,此字段不填", required = false)@RequestParam(name = "parentId", required = false) String parentId, + @ApiParam(name = "decimalDigit", value = "小数位数:保留小数的位数", required = true)@RequestParam("decimalDigit") String decimalDigit, + @ApiParam(name = "roundStrategy", value = "取整策略:0:默认;四舍五入;1:向上取整;2:向下取整", required = true)@RequestParam("roundStrategy") String roundStrategy, + @ApiParam(name = "formulaWithId", value = "公式-带数据源id;文本;统计型独有;需要检查公式有效性;使用文本存储,其他符号和数字用字符串;数据源要换成数据源id;数据源用小写大括号{}来应用", required = false) + @RequestParam(name = "formulaWithId", required = false) String formulaWithId, + @ApiParam(name = "formulaWithName", value = "公式-带数据源名称;文本;统计型独有;需要检查公式有效性;使用文本存储,其他符号和数字用字符串;数据源要换成数据源id;数据源用小写大括号{}来应用", required = false) + @RequestParam(name = "formulaWithName", required = false) String formulaWithName){ + return quotaMainService.creatQuotaMain(quotaName,type,unitType,unit,tagId,interpretation,icon,detail,isSingle,parentId,decimalDigit,roundStrategy,formulaWithId,formulaWithName); } @ApiOperation(value = "新增/修改数据") diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/entity/DimensionMain.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/entity/DimensionMain.java index 02eaaab34e51b2f3176d7a2bff324b9b4f4f55ab..0105eea9d5a144e4af716e022089eed1650421f2 100644 --- a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/entity/DimensionMain.java +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/entity/DimensionMain.java @@ -24,7 +24,7 @@ public class DimensionMain extends BaseEntity { @ApiModelProperty(value = "模型id") private String modelId; - @ApiModelProperty(value = "唯独名称") + @ApiModelProperty(value = "维度名称") private String dimensionName; @ApiModelProperty(value = "父级id") diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/entity/ModelRelation.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/entity/ModelRelation.java new file mode 100644 index 0000000000000000000000000000000000000000..012de61da3cc8344fb5eedb0592810e9e53ff3d4 --- /dev/null +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/entity/ModelRelation.java @@ -0,0 +1,45 @@ +package com.hncy.zhpj.web.biz.entity; + +import com.hncy.common.base.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 模型关联表 + *

+ * + * @author cs + * @since 2021-09-22 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@ApiModel(value="ModelRelation对象", description="模型关联表") +public class ModelRelation extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "关联模型id") + private String modelMainId; + + @ApiModelProperty(value = "关联政策id") + private String policyMainId; + + @ApiModelProperty(value = "关联数据源id") + private String dataSourceMainId; + + @ApiModelProperty(value = "关联计分规则id") + private String scoringRuleMainId; + + + public static final String MODEL_MAIN_ID = "model_main_id"; + + public static final String POLICY_MAIN_ID = "policy_main_id"; + + public static final String DATA_SOURCE_MAIN_ID = "data_source_main_id"; + + public static final String SCORING_RULE_MAIN_ID = "scoring_rule_main_id"; + +} diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/mapper/ModelRelationMapper.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/mapper/ModelRelationMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..dfd5469ba2ae70f55d9f90417f2321497af83a40 --- /dev/null +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/mapper/ModelRelationMapper.java @@ -0,0 +1,16 @@ +package com.hncy.zhpj.web.biz.mapper; + +import com.hncy.zhpj.web.biz.entity.ModelRelation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 模型关联表 Mapper 接口 + *

+ * + * @author cs + * @since 2021-09-22 + */ +public interface ModelRelationMapper extends BaseMapper { + +} diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/mapper/QuotaMainMapper.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/mapper/QuotaMainMapper.java index 6aff32d65fd22d169dd07c35c3599c9a37d24160..9d4a786a5c280fe8ba4cd94a307f8121aa4b1947 100644 --- a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/mapper/QuotaMainMapper.java +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/mapper/QuotaMainMapper.java @@ -17,4 +17,8 @@ import java.util.List; public interface QuotaMainMapper extends BaseMapper { List selectQuotaByDataSourceId(@Param("formulaWithId") String id); + + List searchQuotaMainlist(@Param("nameKeyword") String nameKeyword, @Param("orderType") String orderType, @Param("tagIds") List tagIds); + + int updateInspectionByQuotaId(@Param("id") String quotaId, @Param("inspection") String inspection); } diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/DataSourceMainService.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/DataSourceMainService.java index 9bfc542fc8c78350086fc50ed7c7dc9926e5eb08..4bc3a4fed9342c973505e9bfe4f64936b266ed24 100644 --- a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/DataSourceMainService.java +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/DataSourceMainService.java @@ -18,7 +18,7 @@ import java.util.List; public interface DataSourceMainService extends IService { /** - * @Description 根据名称和排序方式来分页查询数据源 + * @Description 根据名字关键字或者四种排序方式或者标签类型查看数据源列表分页 * @Date 2021/9/15 16:36 * @param pageNum * @param pageSize diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/DimensionMainService.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/DimensionMainService.java index 432dfca18b8c242dad8cc848c7ede497ab935cde..43b9d9c0ddcde6de5c704a295e0441b64c6d4ecb 100644 --- a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/DimensionMainService.java +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/DimensionMainService.java @@ -1,5 +1,6 @@ package com.hncy.zhpj.web.biz.service; +import com.hncy.common.dto.ResultBean; import com.hncy.zhpj.web.biz.entity.DimensionMain; import com.baomidou.mybatisplus.extension.service.IService; @@ -13,4 +14,15 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface DimensionMainService extends IService { + /** + * @Description 创建维度 + * @Date 2021/9/22 14:58 + * @param modelId + * @param dimensionName + * @param parentId + * @param path + * @param level + * @return + */ + ResultBean createDimension(String modelId, String dimensionName, String parentId, String path, String level); } diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/InspectionObjectService.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/InspectionObjectService.java index 4349fbef807c24b9ef2f1457d1b0bd47b18d2ed9..2be0c50888e6187e41422e6e0ea26eb347e7ec93 100644 --- a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/InspectionObjectService.java +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/InspectionObjectService.java @@ -1,7 +1,9 @@ package com.hncy.zhpj.web.biz.service; +import com.hncy.common.dto.ResultBean; import com.hncy.zhpj.web.biz.entity.InspectionObject; import com.baomidou.mybatisplus.extension.service.IService; +import com.hncy.zhpj.web.biz.vo.InspectionObjectVo; /** *

@@ -13,4 +15,11 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface InspectionObjectService extends IService { + /** + * @Description 创建检查对象 + * @Date 2021/9/22 18:06 + * @param inspectionObjectVo + * @return + */ + ResultBean creatInspectionObject(InspectionObjectVo inspectionObjectVo); } diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/ModelMainService.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/ModelMainService.java index d1b31da5c8dd48d004d3b6d858e96930c8c03b88..6a02832b6a9b6017685615a502aa15dd4de045c2 100644 --- a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/ModelMainService.java +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/ModelMainService.java @@ -1,5 +1,6 @@ package com.hncy.zhpj.web.biz.service; +import com.hncy.common.dto.ResultBean; import com.hncy.zhpj.web.biz.entity.ModelMain; import com.baomidou.mybatisplus.extension.service.IService; @@ -13,4 +14,15 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ModelMainService extends IService { + /** + * @Description 创建评价模型 + * @Date 2021/9/22 13:45 + * @param code + * @param modelName + * @param period + * @param description + * @param cover + * @return + */ + ResultBean creatModel(String code, String modelName, String period, String description, String cover); } diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/ModelRelationService.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/ModelRelationService.java new file mode 100644 index 0000000000000000000000000000000000000000..be2a9e426ada4eebb83c7549dbc2525ac3d9e056 --- /dev/null +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/ModelRelationService.java @@ -0,0 +1,16 @@ +package com.hncy.zhpj.web.biz.service; + +import com.hncy.zhpj.web.biz.entity.ModelRelation; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 模型关联表 服务类 + *

+ * + * @author cs + * @since 2021-09-22 + */ +public interface ModelRelationService extends IService { + +} diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/QuotaMainService.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/QuotaMainService.java index ec824bb8e0d71c6ade9a1ff86a0bd3891549696a..a2cc78623f511e9246d4e67209d1211620b79f9e 100644 --- a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/QuotaMainService.java +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/QuotaMainService.java @@ -1,8 +1,11 @@ package com.hncy.zhpj.web.biz.service; +import com.hncy.common.dto.ResultBean; import com.hncy.zhpj.web.biz.entity.QuotaMain; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 指标主表 服务类 @@ -13,4 +16,37 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface QuotaMainService extends IService { + /** + * @Description 根据名字关键字或者四种排序方式或者标签类型查看评价指标列表分页 + * @Date 2021/9/22 15:29 + * @param pageNum + * @param pageSize + * @param nameKeyword + * @param orderType + * @param tagIds + * @return + */ + ResultBean searchQuotaMainlist(int pageNum, int pageSize, String nameKeyword, String orderType, List tagIds); + + /** + * @Description 创建评价指标 + * @Date 2021/9/22 16:41 + * @param quotaName + * @param type + * @param unitType + * @param unit + * @param tagId + * @param interpretation + * @param icon + * @param detail + * @param isSingle + * @param parentId + * @param decimalDigit + * @param roundStrategy + * @param formulaWithId + * @param formulaWithName + * @return + */ + ResultBean creatQuotaMain(String quotaName, String type, String unitType, String unit, String tagId, String interpretation, String icon, String detail, String isSingle, String parentId, String decimalDigit, String roundStrategy, String formulaWithId, String formulaWithName); + } diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/impl/DimensionMainServiceImpl.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/impl/DimensionMainServiceImpl.java index 8f4237b9915fe85f4253b6b48b167d3a730dc214..3531c0993d3b483138f1b502e0b168d5a5ec8eb7 100644 --- a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/impl/DimensionMainServiceImpl.java +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/impl/DimensionMainServiceImpl.java @@ -1,9 +1,14 @@ package com.hncy.zhpj.web.biz.service.impl; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.util.StrUtil; +import com.hncy.common.dto.ResultBean; +import com.hncy.common.exception.custom.BusinessException; import com.hncy.zhpj.web.biz.entity.DimensionMain; import com.hncy.zhpj.web.biz.mapper.DimensionMainMapper; import com.hncy.zhpj.web.biz.service.DimensionMainService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -17,4 +22,23 @@ import org.springframework.stereotype.Service; @Service public class DimensionMainServiceImpl extends ServiceImpl implements DimensionMainService { + @Autowired + private DimensionMainMapper dimensionMainMapper; + + @Override + public ResultBean createDimension(String modelId, String dimensionName, String parentId, String path, String level) { + DimensionMain dimensionMain = new DimensionMain(); + dimensionMain.setDimensionName(dimensionName); + dimensionMain.setLevel(level); + dimensionMain.setModelId(modelId); + dimensionMain.setParentId(parentId); + dimensionMain.setPath(path); + dimensionMain.setGmtCreate(DateTime.now()); + dimensionMain.setDeleted(0); + int insert = dimensionMainMapper.insert(dimensionMain); + if(insert == 0) { + throw new BusinessException("维度创建失败"); + } + return ResultBean.success(dimensionMain.getId()); + } } diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/impl/InspectionObjectServiceImpl.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/impl/InspectionObjectServiceImpl.java index f0fa983d0644fbdbf50a7a802e04125fbc307ea9..12e1dc09b4706c936af0ef53b93bec1ed1fc0ef9 100644 --- a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/impl/InspectionObjectServiceImpl.java +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/impl/InspectionObjectServiceImpl.java @@ -1,10 +1,19 @@ package com.hncy.zhpj.web.biz.service.impl; +import cn.hutool.core.date.DateTime; +import com.hncy.common.dto.ResultBean; +import com.hncy.common.exception.custom.BusinessException; import com.hncy.zhpj.web.biz.entity.InspectionObject; +import com.hncy.zhpj.web.biz.entity.QuotaMain; import com.hncy.zhpj.web.biz.mapper.InspectionObjectMapper; +import com.hncy.zhpj.web.biz.mapper.QuotaMainMapper; import com.hncy.zhpj.web.biz.service.InspectionObjectService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hncy.zhpj.web.biz.vo.InspectionObjectVo; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** *

@@ -17,4 +26,27 @@ import org.springframework.stereotype.Service; @Service public class InspectionObjectServiceImpl extends ServiceImpl implements InspectionObjectService { + @Autowired + private InspectionObjectMapper inspectionObjectMapper; + @Autowired + private QuotaMainMapper quotaMainMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public ResultBean creatInspectionObject(InspectionObjectVo inspectionObjectVo) { + InspectionObject inspectionObject = new InspectionObject(); + BeanUtils.copyProperties(inspectionObjectVo,inspectionObject); + inspectionObject.setDeleted(0); + inspectionObject.setGmtCreate(DateTime.now()); + int insert = inspectionObjectMapper.insert(inspectionObject); + if(insert == 0) { + throw new BusinessException("检查对象添加失败"); + } + + int row = quotaMainMapper.updateInspectionByQuotaId(inspectionObjectVo.getQuotaId(),inspectionObjectVo.getInspection()); + if(row == 0) { + throw new BusinessException("关联指标失败"); + } + return ResultBean.success(inspectionObject.getId()); + } } diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/impl/ModelMainServiceImpl.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/impl/ModelMainServiceImpl.java index 363e44965f0987e5093f992dbeebab5497ac423f..6cd11a95209bf8c1aacc892fa07f2c4f7ea2ec32 100644 --- a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/impl/ModelMainServiceImpl.java +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/impl/ModelMainServiceImpl.java @@ -1,11 +1,17 @@ package com.hncy.zhpj.web.biz.service.impl; +import cn.hutool.core.date.DateTime; +import com.hncy.common.dto.ResultBean; +import com.hncy.common.exception.custom.BusinessException; import com.hncy.zhpj.web.biz.entity.ModelMain; import com.hncy.zhpj.web.biz.mapper.ModelMainMapper; import com.hncy.zhpj.web.biz.service.ModelMainService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.xml.crypto.Data; + /** *

* 模型主表 服务实现类 @@ -17,4 +23,23 @@ import org.springframework.stereotype.Service; @Service public class ModelMainServiceImpl extends ServiceImpl implements ModelMainService { + @Autowired + private ModelMainMapper modelMainMapper; + + @Override + public ResultBean creatModel(String code, String modelName, String period, String description, String cover) { + ModelMain modelMain = new ModelMain(); + modelMain.setCode(code); + modelMain.setCover(cover); + modelMain.setDescription(description); + modelMain.setPeriod(period); + modelMain.setModelName(modelName); + modelMain.setDeleted(0); + modelMain.setGmtCreate(DateTime.now()); + int insert = modelMainMapper.insert(modelMain); + if(insert == 0) { + throw new BusinessException("模型创建失败"); + } + return ResultBean.success(modelMain.getId()); + } } diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/impl/ModelRelationServiceImpl.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/impl/ModelRelationServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..024d89785d39f24a740e4d82518126912b4a3c3c --- /dev/null +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/impl/ModelRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.hncy.zhpj.web.biz.service.impl; + +import com.hncy.zhpj.web.biz.entity.ModelRelation; +import com.hncy.zhpj.web.biz.mapper.ModelRelationMapper; +import com.hncy.zhpj.web.biz.service.ModelRelationService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 模型关联表 服务实现类 + *

+ * + * @author cs + * @since 2021-09-22 + */ +@Service +public class ModelRelationServiceImpl extends ServiceImpl implements ModelRelationService { + +} diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/impl/QuotaMainServiceImpl.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/impl/QuotaMainServiceImpl.java index b36f2072d5bde925f3df89a32b2ef2f99d3343e2..7d2f6a0e7777089db0850e2b3588a6063fa77467 100644 --- a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/impl/QuotaMainServiceImpl.java +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/impl/QuotaMainServiceImpl.java @@ -1,11 +1,17 @@ package com.hncy.zhpj.web.biz.service.impl; +import com.hncy.common.dto.ResultBean; +import com.hncy.common.exception.custom.BusinessException; +import com.hncy.pageable.spring.boot.starter.core.Page; import com.hncy.zhpj.web.biz.entity.QuotaMain; import com.hncy.zhpj.web.biz.mapper.QuotaMainMapper; import com.hncy.zhpj.web.biz.service.QuotaMainService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 指标主表 服务实现类 @@ -17,4 +23,65 @@ import org.springframework.stereotype.Service; @Service public class QuotaMainServiceImpl extends ServiceImpl implements QuotaMainService { + @Autowired + private QuotaMainMapper quotaMainMapper; + + @Override + public ResultBean searchQuotaMainlist(int pageNum, int pageSize, String nameKeyword, String orderType, List tagIds) { + Page page = Page.doSelectPage(()->quotaMainMapper.searchQuotaMainlist(nameKeyword,orderType,tagIds)); + return ResultBean.success(page); + + } + + @Override + public ResultBean creatQuotaMain(String quotaName, String type, String unitType, String unit, String tagId, String interpretation, String icon, String detail, String isSingle, String parentId, String decimalDigit, String roundStrategy, String formulaWithId, String formulaWithName) { + QuotaMain quotaMain = new QuotaMain(); + quotaMain.setQuotaName(quotaName); + quotaMain.setTagId(tagId); + quotaMain.setInterpretation(interpretation); + quotaMain.setDecimalDigit(decimalDigit); + quotaMain.setDetail(detail); + quotaMain.setIcon(icon); + quotaMain.setParentId(parentId); + quotaMain.setRoundStrategy(roundStrategy); + quotaMain.setUnitType(unitType); + + if("1".equals(type)) { + //统计型 + quotaMain.setType(type); + quotaMain.setUnit(unit); + quotaMain.setFormulaWithId(formulaWithId); + quotaMain.setFormulaWithName(formulaWithName); + + if("0".equals(isSingle)) { + //综合指标 + //TODO 综合指标业务 + quotaMain.setIsSingle(isSingle); + + }else { + //单指标 + quotaMain.setIsSingle(isSingle); + } + + }else if("2".equals(type)) { + //现场检查型 + quotaMain.setType(type); + + }else if("3".equals(type)) { + //满意度调查型 + quotaMain.setType(type); + quotaMain.setUnit(unit); + }else { + //大数据分析型 + quotaMain.setType(type); + quotaMain.setUnit(unit); + } + + int insert = quotaMainMapper.insert(quotaMain); + if(insert == 0) { + throw new BusinessException("指标添加失败"); + } + + return ResultBean.success(quotaMain.getId()); + } } diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/vo/InspectionObjectVo.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/vo/InspectionObjectVo.java new file mode 100644 index 0000000000000000000000000000000000000000..5e8611b1013903554ca4c7c19bbc74e7aa969ef8 --- /dev/null +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/vo/InspectionObjectVo.java @@ -0,0 +1,35 @@ +package com.hncy.zhpj.web.biz.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * @Author: cs + * @Date: 2021/9/22 18:02 + * 创建检查对象vo + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode +public class InspectionObjectVo { + + @ApiModelProperty(value = "关联指标id:现场检查型") + private String quotaId; + + @ApiModelProperty(value = "类型;从数据字典中获取,商业街...数据字典中id") + private String typeId; + + @ApiModelProperty(value = "数量") + private String nameValue; + + @ApiModelProperty(value = "备注") + private String description; + + @ApiModelProperty(value = "检查要求") + private String inspection; + +} diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/resources/mapper/ModelRelationMapper.xml b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/resources/mapper/ModelRelationMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..d60bd731f8aaa6d89c8bf0c64ea4323dc7de296c --- /dev/null +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/resources/mapper/ModelRelationMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + id, + gmt_create, + create_by, + gmt_modified, + update_by, + deleted, + model_main_id, policy_main_id, data_source_main_id, scoring_rule_main_id + + + diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/resources/mapper/QuotaMainMapper.xml b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/resources/mapper/QuotaMainMapper.xml index 646fcfe81007c82878f15d026dc21cb3c35437f3..efbd51a1b70e422ca4767772a2683d42175d4056 100644 --- a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/resources/mapper/QuotaMainMapper.xml +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/resources/mapper/QuotaMainMapper.xml @@ -36,9 +36,39 @@ update_by, quota_name, type, unit_type, unit, tag_id, interpretation, icon, detail, is_single, parent_id, decimal_digit, round_strategy, formula_with_id, formula_with_name, inspection, deleted + + UPDATE quota_main SET inspection = #{inspection} + WHERE id = #{id} + + +