升级swagger和随访代码

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

@@ -36,9 +36,29 @@ public class ServicePackageItemDO extends UuidIdentityEntity implements java.io.
    private String leasedCode;//租户code
    private String leasedName;//租户name
    private String subItemType;//是否包含子项目
    private String templateCode;//模板的code
    private String templateType;//模板的类型
    private String subItemId;//数据库不存在的字段
    @Column(name = "template_type")
    public String getTemplateType() {
        return templateType;
    }
    public void setTemplateType(String templateType) {
        this.templateType = templateType;
    }
    @Column(name = "template_code")
    public String getTemplateCode() {
        return templateCode;
    }
    public void setTemplateCode(String templateCode) {
        this.templateCode = templateCode;
    }
    @Transient
    public String getSubItemId() {
        return subItemId;

common/common-entity/src/main/java/com/yihu/jw/entity/followup/FollowupTemplate.java

@@ -0,0 +1,123 @@
package com.yihu.jw.entity.followup;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.*;
/**
 * 随访模板表
 */
@Entity
@Table(name = "base_followup_template")
public class FollowupTemplate extends UuidIdentityEntityWithOperator {
	@Column(name = "template_name")
	private String templateName;
	@Column(name = "followup_statrt_time_type")
	private String followupStatrtTimeType;
	@Column(name = "followup_count")
	private String followupCount;
	@Column(name = "description")
	private String description;
	@Column(name = "template_detail_json")
	private String templateDetailJson;
	@Column(name = "status")
	private String status;
	@Column(name = "leased_code")
	private String leasedCode;
	@Column(name = "leased_name")
	private String leasedName;
	@Column(name = "org_code")
	private String orgCode;
	@Column(name = "org_name")
	private String orgName;
	public String getTemplateName() {
		return templateName;
	}
	public void setTemplateName(String templateName) {
		this.templateName = templateName;
	}
	public String getFollowupStatrtTimeType() {
		return followupStatrtTimeType;
	}
	public void setFollowupStatrtTimeType(String followupStatrtTimeType) {
		this.followupStatrtTimeType = followupStatrtTimeType;
	}
	public String getFollowupCount() {
		return followupCount;
	}
	public void setFollowupCount(String followupCount) {
		this.followupCount = followupCount;
	}
	public String getDescription() {
		return description;
	}
	public void setDescription(String description) {
		this.description = description;
	}
	public String getTemplateDetailJson() {
		return templateDetailJson;
	}
	public void setTemplateDetailJson(String templateDetailJson) {
		this.templateDetailJson = templateDetailJson;
	}
	public String getStatus() {
		return status;
	}
	public void setStatus(String status) {
		this.status = status;
	}
	public String getLeasedCode() {
		return leasedCode;
	}
	public void setLeasedCode(String leasedCode) {
		this.leasedCode = leasedCode;
	}
	public String getLeasedName() {
		return leasedName;
	}
	public void setLeasedName(String leasedName) {
		this.leasedName = leasedName;
	}
	public String getOrgCode() {
		return orgCode;
	}
	public void setOrgCode(String orgCode) {
		this.orgCode = orgCode;
	}
	public String getOrgName() {
		return orgName;
	}
	public void setOrgName(String orgName) {
		this.orgName = orgName;
	}
}

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/TemplateJson.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
@@ -13,6 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "template_json")
@SequenceGenerator(name="id_generated", sequenceName="DICT_DOCTOR_DUTY_SEQ")
public class TemplateJson extends UuidIdentityEntity {
    private String templateId;

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -316,6 +316,14 @@ public class BaseRequestMapping {
        public static final String INIT_WITHOUT_CONDITION  = "/initWithoutCondition";
    }
    /**
     * 随访
     */
    public static class Follow extends Basic {
        public static final String PREFIX_TEMPLATE  = "/followupTemplate";
    }
    /**
     * 通知公告
     */

starter/swagger-starter/pom.xml

@@ -14,29 +14,35 @@
    <dependencies>
        <dependency>
            <groupId>com.github.xiaoymin</groupId>
            <artifactId>swagger-bootstrap-ui</artifactId>
            <version>1.9.3</version>
        </dependency>
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger2</artifactId>
            <version>${version.swagger}</version>
        </dependency>
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger-ui</artifactId>
            <version>${version.swagger-ui}</version>
        </dependency>
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-staticdocs</artifactId>
            <version>${version.springfox-staticdocs}</version>
        </dependency>
        <dependency>
            <groupId>io.github.swagger2markup</groupId>
            <artifactId>swagger2markup</artifactId>
            <version>${version.swagger2markup}</version>
            <artifactId>knife4j-spring-boot-starter</artifactId>
            <version>2.0.2</version>
        </dependency>
<!--        <dependency>-->
<!--            <groupId>com.github.xiaoymin</groupId>-->
<!--            <artifactId>swagger-bootstrap-ui</artifactId>-->
<!--            <version>1.9.3</version>-->
<!--        </dependency>-->
<!--        <dependency>-->
<!--            <groupId>io.springfox</groupId>-->
<!--            <artifactId>springfox-swagger2</artifactId>-->
<!--            <version>${version.swagger}</version>-->
<!--        </dependency>-->
<!--        <dependency>-->
<!--            <groupId>io.springfox</groupId>-->
<!--            <artifactId>springfox-swagger-ui</artifactId>-->
<!--            <version>${version.swagger-ui}</version>-->
<!--        </dependency>-->
<!--        <dependency>-->
<!--            <groupId>io.springfox</groupId>-->
<!--            <artifactId>springfox-staticdocs</artifactId>-->
<!--            <version>${version.springfox-staticdocs}</version>-->
<!--        </dependency>-->
<!--        <dependency>-->
<!--            <groupId>io.github.swagger2markup</groupId>-->
<!--            <artifactId>swagger2markup</artifactId>-->
<!--            <version>${version.swagger2markup}</version>-->
<!--        </dependency>-->
    </dependencies>
</project>

starter/swagger-starter/src/main/java/com/yihu/jw/SwaggerConfig.java

@@ -1,6 +1,6 @@
package com.yihu.jw;
import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrapUI;
import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import springfox.documentation.builders.ApiInfoBuilder;
@@ -21,9 +21,10 @@ import java.util.List;
import static com.google.common.base.Predicates.or;
import static springfox.documentation.builders.PathSelectors.regex;
@EnableKnife4j
@Configuration
@EnableSwagger2
@EnableSwaggerBootstrapUI
//@EnableSwaggerBootstrapUI
public class SwaggerConfig {
    public static final String API_VERSION = "v1.0";

svr/svr-base/src/main/java/com/yihu/jw/base/dao/followup/FollowupTemplateDao.java

@@ -0,0 +1,10 @@
package com.yihu.jw.base.dao.followup;
import com.yihu.jw.entity.followup.FollowupTemplate;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
public interface FollowupTemplateDao extends JpaRepository<FollowupTemplate, String>, JpaSpecificationExecutor<FollowupTemplate> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/followup/FollowupTemplatePoint.java

@@ -0,0 +1,94 @@
package com.yihu.jw.base.endpoint.followup;
import com.alibaba.fastjson.JSON;
import com.yihu.jw.base.service.followup.FollowupTemplateService;
import com.yihu.jw.entity.followup.FollowupTemplate;
import com.yihu.jw.restmodel.qvo.ParamQvo;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping(value = BaseRequestMapping.Follow.PREFIX_TEMPLATE)
@Api(value = "随访模板", description = "随访模板", tags = {"随访模板"})
public class FollowupTemplatePoint extends EnvelopRestEndpoint {
    @Autowired
    private FollowupTemplateService followupTemplateService;
    @GetMapping(value = "findList")
    @ApiOperation(value = "获取模板列表")
    public PageEnvelop<Map<String, Object>> findList(
            @ApiParam(name = "jsonStr", value = "jsonStr") @RequestParam(value = "jsonStr", required = false) String jsonStr
    ) throws Exception {
        ParamQvo qvo = JSON.parseObject(jsonStr, ParamQvo.class);
        HashMap<String, Object> map = followupTemplateService.findList(qvo);
        List<Map<String, Object>> list = (List<Map<String, Object>>) map.get("list");
        Integer count = (Integer) map.get("count");
        return success(list, count, qvo.getPage(), qvo.getPageSize());
    }
    /**
     * 创建模板和更新模板
     */
    @PostMapping(value = "createTemplate")
    @ApiOperation(value = "创建模板")
    public ObjEnvelop createTemplate(
            @ApiParam(name = "jsonStr", value = "jsonStr") @RequestParam(value = "jsonStr", required = false) String jsonStr
    ) throws Exception {
        FollowupTemplate vo = JSON.parseObject(jsonStr, FollowupTemplate.class);
        FollowupTemplate entity = followupTemplateService.createTemplate(vo);
        return success("创建成功", entity);
    }
    /**
     * 改变模板状态
     */
    @PostMapping(value = "changeTemplateStatus")
    @ApiOperation(value = "改变模板状态")
    public ObjEnvelop changeTemplateStatus(
            @ApiParam(name = "jsonStr", value = "jsonStr") @RequestParam(value = "jsonStr", required = false) String jsonStr
    ) throws Exception {
        ParamQvo qvo = JSON.parseObject(jsonStr, ParamQvo.class);
        try {
            FollowupTemplate entity = followupTemplateService.changeTemplateStatus(qvo);
            return success("改变模板状态成功", entity);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
        }
    }
    /**
     * 删除模板
     */
    @PostMapping(value = "deleteTemplate")
    @ApiOperation(value = "删除模板")
    public Envelop deleteTemplate(
            @ApiParam(name = "jsonStr", value = "jsonStr") @RequestParam(value = "jsonStr", required = false) String jsonStr
    ) throws Exception {
        ParamQvo qvo = JSON.parseObject(jsonStr, ParamQvo.class);
        try {
            followupTemplateService.deleteTemplate(qvo);
            return success("删除成功");
        } catch (Exception e) {
            return failedObjEnvelopException(e);
        }
    }
}

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

@@ -93,6 +93,8 @@ public class ServicePackageEndpoint extends EnvelopRestEndpoint {
    }
    //--------------------------------------------------------------------------------------
    //
    //--------------------------------------------------------------------------------------

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

@@ -53,7 +53,7 @@ public class ServicePackageItemEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "page", value = "页码") @RequestParam(value = "page", required = false) int page,
            @ApiParam(name = "pageSize", value = "数量") @RequestParam(value = "pageSize", required = false) int pageSize
    ) throws Exception {
        Map<String, Object> map = servicePackageItemService.getItemList(leasedCode, orgCode, itemName, status, configureIf,pageIf, page, pageSize);
        Map<String, Object> map = servicePackageItemService.getItemList(leasedCode, orgCode, itemName, status, configureIf, pageIf, page, pageSize);
        List<Map<String, Object>> list = (List<Map<String, Object>>) map.get("list");
        Integer count = (Integer) map.get("count");
        return success(list, count, page, pageSize);
@@ -86,6 +86,7 @@ public class ServicePackageItemEndpoint extends EnvelopRestEndpoint {
        if (org.apache.commons.lang3.StringUtils.isBlank(qvo.getId())) {
            return failed("ID不能为空", ObjEnvelop.class);
        }
        System.out.println("参数:" + JSON.toJSONString(qvo));
        ServicePackageItemDO entity = servicePackageItemService.changeState(qvo);
        return success(entity);
    }
@@ -129,9 +130,6 @@ public class ServicePackageItemEndpoint extends EnvelopRestEndpoint {
    }
    @GetMapping(value = "page")
    @ApiOperation(value = "获取分页")
    public PageEnvelop<ServicePackageItemDO> page(

svr/svr-base/src/main/java/com/yihu/jw/base/service/followup/FollowupTemplateService.java

@@ -0,0 +1,88 @@
package com.yihu.jw.base.service.followup;
import com.yihu.jw.base.dao.followup.FollowupTemplateDao;
import com.yihu.jw.entity.followup.FollowupTemplate;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.qvo.ParamQvo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
public class FollowupTemplateService extends BaseJpaService<FollowupTemplate, FollowupTemplateDao> {
    @Autowired
    private FollowupTemplateDao followupTemplateDao;
    @Autowired
    JdbcTemplate jdbcTemplate;
    public HashMap<String, Object> findList(ParamQvo qvo) {
        String detailSql = "SELECT * ";
        String countSql = "SELECT COUNT(1) ";
        String conditionSql = " FROM base_followup_template WHERE 1=1 ";
        String pageSql = "";
        if (StringUtils.isNotBlank(qvo.getSearchKey())) {
            conditionSql += " AND `template_name`='" + qvo.getSearchKey() + "'";
        }
        if (StringUtils.isNotBlank(qvo.getStatus())) {
            conditionSql += " AND `status`='" + qvo.getStatus() + "'";
        }
        if (StringUtils.isNotBlank(qvo.getLeasedCode())) {
            conditionSql += " AND `leased_code`='" + qvo.getLeasedCode() + "'";
        }
        if (StringUtils.isNotBlank(qvo.getOrgCode())) {
            conditionSql += " AND `org_code`='" + qvo.getOrgCode() + "'";
        }
        if (StringUtils.isNotBlank(qvo.getPageIf())) {
            pageSql = "limit " + (qvo.getPage() - 1) * qvo.getPageSize() + "," + qvo.getPageSize();
        }
        //查询
        detailSql += conditionSql + pageSql;
        countSql += conditionSql;
        List<Map<String, Object>> list = jdbcTemplate.queryForList(detailSql);
        Integer count = jdbcTemplate.queryForObject(countSql, Integer.class);
        HashMap<String, Object> map = new HashMap<>();
        map.put("list", list);
        map.put("count", count);
        return map;
    }
    /**
     * 创建模板
     */
    public FollowupTemplate createTemplate(FollowupTemplate vo) {
        FollowupTemplate entity = followupTemplateDao.save(vo);
        return entity;
    }
    /**
     * 改变模板状态
     */
    public FollowupTemplate changeTemplateStatus(ParamQvo qvo) throws Exception {
        FollowupTemplate entity = followupTemplateDao.findById(qvo.getId()).orElse(null);
        if (entity != null) {
            entity.setStatus(qvo.getStatus());
            FollowupTemplate save = followupTemplateDao.save(entity);
            return save;
        } else {
            throw new Exception("没找到模板信息");
        }
    }
    /**
     * 删除模板
     */
    public void deleteTemplate(ParamQvo qvo) {
        String sql = "DELETE FROM base_followup_template WHERE 1=1 AND id='" + qvo.getId() + "'";
        jdbcTemplate.execute(sql);
    }
}