服务包计划配置

common/common-entity/src/main/java/com/yihu/jw/entity/base/servicePackage/ServiceItemConfig.java

@@ -5,6 +5,8 @@ import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
/**
@@ -16,10 +18,10 @@ import java.util.Date;
public class ServiceItemConfig extends UuidIdentityEntity implements java.io.Serializable {
    @Column(name = "package_id")
    private String packageId;//名称
    private String packageId;//服务包id
    @Column(name = "server_item_id")
    private String serverItemId;//项目的id
    private String serverItemId;//项目的id-对应item表主键
    @Column(name = "assess_type")
    private String assessType;//说明
@@ -36,8 +38,8 @@ public class ServiceItemConfig extends UuidIdentityEntity implements java.io.Ser
    @Column(name = "server_time_type")
    private String serverTimeType;
    @Column(name = "serverCount")
    private String server_count;
    @Column(name = "server_count")
    private String serverCount;
    @Column(name = "template_type")
    private String templateType;
@@ -52,6 +54,30 @@ public class ServiceItemConfig extends UuidIdentityEntity implements java.io.Ser
    @Column(name = "pricing_units_name")
    private String pricingUnitsName;//计价单位名称
    @Column(name = "frequency_code")
    private String frequencyCode;//频次
    private String name;//名称
    @Transient
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getFrequencyCode() {
        return frequencyCode;
    }
    public void setFrequencyCode(String frequencyCode) {
        this.frequencyCode = frequencyCode;
    }
    public String getPricingUnitsCode() {
        return pricingUnitsCode;
    }
@@ -124,12 +150,12 @@ public class ServiceItemConfig extends UuidIdentityEntity implements java.io.Ser
        this.serverTimeType = serverTimeType;
    }
    public String getServer_count() {
        return server_count;
    public String getServerCount() {
        return serverCount;
    }
    public void setServer_count(String server_count) {
        this.server_count = server_count;
    public void setServerCount(String serverCount) {
        this.serverCount = serverCount;
    }
    public String getTemplateType() {

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/servicePackage/ServicePackageEndpoint.java

@@ -5,6 +5,7 @@ import com.yihu.jw.base.dao.servicePackage.ServicePackageDao;
import com.yihu.jw.base.dao.servicePackage.ServicePackageItemDao;
import com.yihu.jw.base.service.servicePackage.ServiceItemConfigService;
import com.yihu.jw.base.service.servicePackage.ServicePackageService;
import com.yihu.jw.entity.base.servicePackage.ServiceItemConfig;
import com.yihu.jw.entity.base.servicePackage.ServicePackageDO;
import com.yihu.jw.entity.base.servicePackage.ServicePackageItemDO;
import com.yihu.jw.restmodel.qvo.ParamQvo;
@@ -130,7 +131,7 @@ public class ServicePackageEndpoint extends EnvelopRestEndpoint {
        jsonStr = URLDecoder.decode(jsonStr, "UTF-8");
        System.out.println("入参:" + JSON.toJSONString(jsonStr));
        ParamQvo qvo = JSON.parseObject(jsonStr, ParamQvo.class);
        List<Map<String, Object>> list = itemConfigService.findItemConfig(qvo);
        List<ServiceItemConfig> list = itemConfigService.findItemConfig(qvo);
        return success("配置服务项计划成功", list);
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/servicePackage/ServicePackageSubItemEndpoint.java

@@ -8,7 +8,6 @@ import com.yihu.jw.base.service.servicePackage.ServicePackageSubItemService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.base.vo.excel.SubItemExcelVo;
import com.yihu.jw.entity.base.servicePackage.ServicePackageSubItemDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.restmodel.qvo.ParamQvo;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
@@ -108,7 +107,7 @@ public class ServicePackageSubItemEndpoint extends EnvelopRestEndpoint {
     * 导入数据
     */
    @PostMapping(value = "/importSubItemExcel")
    public void importSubItemExcel(
    public Envelop importSubItemExcel(
            @ApiParam(value = "文件", required = true)
            @RequestParam(value = "file", required = true) MultipartFile file) {
        try {
@@ -121,9 +120,11 @@ public class ServicePackageSubItemEndpoint extends EnvelopRestEndpoint {
                    .doReadSync();
            subItemService.importSubItemExcel(list);
            return success("导入成功!");
        } catch (Exception exception) {
            throw new RuntimeException(exception);
            System.out.println(exception);
//            throw new RuntimeException(exception);
            return failed("导入失败!");
        }
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/servicePackage/ServiceItemConfigService.java

@@ -1,7 +1,6 @@
package com.yihu.jw.base.service.servicePackage;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.alibaba.fastjson.JSON;
import com.yihu.jw.base.dao.servicePackage.ServiceItemConfigDao;
import com.yihu.jw.entity.base.servicePackage.ServiceItemConfig;
import com.yihu.jw.mysql.query.BaseJpaService;
@@ -9,12 +8,12 @@ import com.yihu.jw.restmodel.qvo.ParamQvo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -36,31 +35,38 @@ public class ServiceItemConfigService extends BaseJpaService<ServiceItemConfig,
     * 保存服务项的配置
     */
    public void changeItemConfig(ParamQvo qvo) throws Exception {
//        ObjectMapper objectMapper = new ObjectMapper();
        String jsonContent = qvo.getJsonContent();
        ObjectMapper objectMapper = new ObjectMapper();
        //转换成数组
        List<ServiceItemConfig> itemConfigList = objectMapper.readValue(jsonContent, new TypeReference<List<ServiceItemConfig>>() {
        });
        List<ServiceItemConfig> itemConfigList = JSON.parseArray(jsonContent, ServiceItemConfig.class);
//        //转换成数组
//        List<ServiceItemConfig> itemConfigList = objectMapper.readValue(jsonContent, new TypeReference<List<ServiceItemConfig>>() {
//        });
        String collect = itemConfigList.stream().map(vo -> String.valueOf("'" + vo.getServerItemId() + "'"))
                .collect(Collectors.joining(",", "(", ") "));
        //删除服务项的配置
        String sql = " DELETE FROM base_service_item_config q WHERE q.package_id='" + qvo.getId() + "' AND q.server_item_id IN " + collect;
        jdbcTemplate.execute(sql);
        //保存
//        for (ServiceItemConfig config : itemConfigList) {
//            itemConfigDao.save(config);
//        }
        itemConfigDao.saveAll(itemConfigList);
    }
    public List<Map<String, Object>> findItemConfig(ParamQvo qvo) {
    public List<ServiceItemConfig> findItemConfig(ParamQvo qvo) {
        String sql = "SELECT\n" +
                "	b.name,a.* \n" +
                "FROM\n" +
                "	base_service_item_config a\n" +
                "	INNER JOIN base_service_package_item b ON a.package_id = b.service_package_id \n" +
                "	AND a.server_item_id = b.service_package_item_id\n" +
                "	AND a.server_item_id = b.id \n" +
                "	WHERE 1=1 AND a.package_id='" + qvo.getId() + "'";
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
        List<ServiceItemConfig> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(ServiceItemConfig.class));
//        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
        return list;
    }
}