Merge branch 'dev' of http://192.168.1.220:10080/jiwei/wlyy2.0 into dev

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

@@ -20,8 +20,10 @@ public class RehabilitationOperateRecordsDO extends UuidIdentityEntityWithOperat
    private String patientName;//居民名称
    private String doctorCode;//执行医生code
    private String doctorName;//执行医生名称
    private Integer relationRecordType;//关联记录类型（1、随访记录，2、健康指导，3、健康教育）
    private String node;//服务完成笔记
    private Integer relationRecordType;//关联记录类型（1、随访记录，2、健康指导，3、健康教育，4、服务码）
    private String relationRecordCode;//关联记录code
    private String relationRecordImg;//相关记录图片地址，json格式
    private Date reserveTime;//服务预定完成时间
    private Date completeTime;//服务完成时间
    private Integer status;//是否确认完成（0、未确认，1、已确认）
@@ -82,6 +84,15 @@ public class RehabilitationOperateRecordsDO extends UuidIdentityEntityWithOperat
        this.doctorName = doctorName;
    }
    @Column(name = "node")
    public String getNode() {
        return node;
    }
    public void setNode(String node) {
        this.node = node;
    }
    @Column(name = "relation_record_type")
    public Integer getRelationRecordType() {
        return relationRecordType;
@@ -100,6 +111,15 @@ public class RehabilitationOperateRecordsDO extends UuidIdentityEntityWithOperat
        this.relationRecordCode = relationRecordCode;
    }
    @Column(name = "relation_record_img")
    public String getRelationRecordImg() {
        return relationRecordImg;
    }
    public void setRelationRecordImg(String relationRecordImg) {
        this.relationRecordImg = relationRecordImg;
    }
    @Column(name = "reserve_time")
    public Date getReserveTime() {
        return reserveTime;

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

@@ -214,7 +214,7 @@ public class BaseRequestMapping {
    /**
     * 居民信息
     * 机构信息
     */
    public static class BaseOrg extends Basic {
        public static final String PREFIX  = "/baseOrg";
@@ -222,7 +222,7 @@ public class BaseRequestMapping {
    /**
     * 省字典
     * 患者信息
     */
    public static class BasePatient extends Basic {
        public static final String PREFIX  = "/basePatient";
@@ -230,7 +230,7 @@ public class BaseRequestMapping {
    /**
     * 街道字典
     * 省份字典
     */
    public static class BaseProvince extends Basic {
        public static final String PREFIX  = "/baseProvince";

common/common-request-mapping/src/main/java/com/yihu/jw/rm/specialist/SpecialistMapping.java

@@ -73,6 +73,9 @@ public class SpecialistMapping {
        public static final String updateStatusRehabilitationOperate = "/updateStatusRehabilitationOperate";
        public static final String patientRehabilitationDetail = "/patientRehabilitationDetail";
        public static final String recentPlanDetailRecord = "/recentPlanDetailRecord";
        public static final String saveRehabilitationOperateRecodr="/saveRehabilitationOperateRecodr";
        public static final String updateNoteAndImageRehabilitationOperate = "/updateNoteAndImageRehabilitationOperate";
        public static final String findServiceItemsByHospital = "/findServiceItemsByHospital";
        public static final String serviceDoctorList = "/serviceDoctorList";
        public static final String dailyJob = "/dailyJob";

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/servicePackage/ServicePackageDetailsVO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.restmodel.base.servicePackage;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.restmodel.UuidIdentityVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -24,6 +25,7 @@ public class ServicePackageDetailsVO extends UuidIdentityVO {
    @ApiModelProperty(value = "创建时间")
    private Date createTime;//创建时间',
    @ApiModelProperty(value = "执行时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
    private Date executionTime;//执行时间',
    @ApiModelProperty(value = "执行类型", example = "1")
    private String executionType;//执行类型（1固定时间，2固定次数（不固定时间），3长期）',

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/specialist/PatientSignInfoVO.java

@@ -20,6 +20,10 @@ public class PatientSignInfoVO {
    private String patient;
    @ApiModelProperty("居民")
    private String patientName;
    @ApiModelProperty("居民身份证")
    private String idcard;
    @ApiModelProperty("居民社保卡号")
    private String ssc;
    @ApiModelProperty("医生code")
    private String doctor;
    @ApiModelProperty("医生")
@@ -195,4 +199,20 @@ public class PatientSignInfoVO {
    public void setHealthAssistantName(String healthAssistantName) {
        this.healthAssistantName = healthAssistantName;
    }
    public String getIdcard() {
        return idcard;
    }
    public void setIdcard(String idcard) {
        this.idcard = idcard;
    }
    public String getSsc() {
        return ssc;
    }
    public void setSsc(String ssc) {
        this.ssc = ssc;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/web/Envelop.java

@@ -20,8 +20,6 @@ public class Envelop implements Serializable {
    protected String message;
    @ApiModelProperty(value = "状态（200 - 成功)", example = "200")
    protected Integer status = EnvelopStatus.success.code;
    @ApiModelProperty(value = "错误码", example = "200")
    protected String errorCode;
    public Integer getStatus() {
        return status;
@@ -39,14 +37,6 @@ public class Envelop implements Serializable {
        this.message = message;
    }
    public String getErrorCode() {
        return errorCode;
    }
    public void setErrorCode(String errorCode) {
        this.errorCode = errorCode;
    }
    public static Envelop getSuccess(String message) {
        Envelop envelop = new Envelop();
        envelop.setMessage(message);

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/web/endpoint/EnvelopRestEndpoint.java

@@ -1,13 +1,8 @@
package com.yihu.jw.restmodel.web.endpoint;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.*;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
@@ -17,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
import java.beans.PropertyDescriptor;
import java.io.IOException;
import java.lang.reflect.Method;
import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -44,14 +40,6 @@ public abstract class EnvelopRestEndpoint {
        return envelop;
    }
    protected Envelop error(String message,String errorCode){
        Envelop envelop = new Envelop();
        envelop.setMessage(message);
        envelop.setErrorCode(errorCode);
        envelop.setStatus(-1);
        return envelop;
    }
    protected <J> ObjEnvelop<J> success(J obj){
        return success("success", obj);
    }
@@ -172,6 +160,17 @@ public abstract class EnvelopRestEndpoint {
        return mixEnvelop;
    }
    protected Envelop failed (String message) {
        return failed(message, -10000);
    }
    protected Envelop failed (String message, int status) {
        Envelop envelop = new Envelop();
        envelop.setMessage(message);
        envelop.setStatus(status);
        return envelop;
    }
    protected <E extends Envelop> E failed(String message, Class<E> clazz) {
        return failed(message, -10000, clazz);
    }
@@ -192,6 +191,12 @@ public abstract class EnvelopRestEndpoint {
        return entity;
    }
    protected <T> T toDateEntity(String json, Class<T> target) throws IOException {
        objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
        T entity = objectMapper.readValue(json, target);
        return entity;
    }
    protected <T> T convertToModel(Object source, Class<T> target, String... properties) {
        if (source == null) {
            return null;

svr/svr-base/src/main/java/com/yihu/jw/base/activemq/ConsumerRunner.java

@@ -76,7 +76,7 @@ public class ConsumerRunner implements Runnable, ExceptionListener {
    @Override
    public void onException(JMSException e) {
        LOGGER.error("Trying to recover from JMS Connection exception: " + e);
        LOGGER.error("Trying to recover from JMS Connection exception", e);
        try {
            topicConnection.close();
            topicConnection.start();

svr/svr-base/src/main/java/com/yihu/jw/base/activemq/MessageManager.java

@@ -1,7 +1,7 @@
package com.yihu.jw.base.activemq;
import com.yihu.jw.base.service.MqMessageService;
import com.yihu.jw.base.service.MqMessageSubscriberService;
import com.yihu.jw.base.service.message.MqMessageService;
import com.yihu.jw.base.service.message.MqMessageSubscriberService;
import com.yihu.jw.entity.base.message.MqMessageDO;
import com.yihu.jw.entity.base.message.MqMessageSubscriberDO;
import org.slf4j.Logger;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.function;
import com.yihu.jw.entity.base.function.FunctionDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.message;
import com.yihu.jw.entity.base.message.MqMessageDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.message;
import com.yihu.jw.entity.base.message.MqMessageSubscriberDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.module;
import com.yihu.jw.entity.base.module.ModuleDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

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

@@ -1,9 +1,10 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.oauth2;
import com.yihu.jw.entity.base.oauth2.OauthClientDetailsDO;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * Dao - Oauth2
 * Created by progr1mmer on 2018/1/23.
 */
public interface OauthClientDetailsDao extends JpaRepository<OauthClientDetailsDO, String> {

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

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.role;
import com.yihu.jw.entity.base.role.RoleDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.saas;
import com.yihu.jw.entity.base.saas.SaasDO;
import org.springframework.data.repository.PagingAndSortingRepository;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.saas;
import com.yihu.jw.entity.base.saas.SaasDO;
import com.yihu.jw.entity.base.saas.SaasDefaultModuleFunctionDO;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.saas;
import com.yihu.jw.entity.base.saas.SaasModuleFunctionDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.sms;
import com.yihu.jw.entity.base.sms.SmsDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.sms;
import com.yihu.jw.entity.base.sms.SmsGatewayDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.sms;
import com.yihu.jw.entity.base.sms.SmsTemplateDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.system;
import com.yihu.jw.entity.base.system.SystemDictDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.system;
import com.yihu.jw.entity.base.system.SystemDictEntryDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.theme;
import com.yihu.jw.entity.base.theme.ThemeDO;
import org.springframework.data.repository.PagingAndSortingRepository;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.user;
import com.yihu.jw.entity.base.user.UserDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.user;
import com.yihu.jw.entity.base.user.UserHideModuleFunctionDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.user;
import com.yihu.jw.entity.base.user.UserRoleDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/area/BaseCityEndpoint.java

@@ -98,7 +98,7 @@ public ObjEnvelop<BaseCityVO> create (
             @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
             @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
             List<BaseCityDO> baseCitys = baseCityService.search(fields, filters, sorts);
                  return success(baseCitys, BaseCityVO.class);
             return success(baseCitys, BaseCityVO.class);
         }
 }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/function/FunctionEndpoint.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.endpoint.function;
import com.yihu.jw.base.service.FunctionService;
import com.yihu.jw.base.service.function.FunctionService;
import com.yihu.jw.entity.base.function.FunctionDO;
import com.yihu.jw.restmodel.base.function.FunctionVO;
import com.yihu.jw.restmodel.web.Envelop;
@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.Function.PREFIX)
@Api(value = "功能管理", description = "功能管理服务接口", tags = {"模块和功能 - 功能管理服务接口"})
@Api(value = "功能管理", description = "功能管理服务接口", tags = {"wlyy基础服务 - 功能管理服务接口"})
public class FunctionEndpoint extends EnvelopRestEndpoint {
    @Autowired
@@ -45,7 +45,7 @@ public class FunctionEndpoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        functionService.delete(ids);
        functionService.delete(ids.split(","));
        return success("success");
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/im/ImGetuiConfigEndpiont.java

@@ -44,7 +44,7 @@ public class ImGetuiConfigEndpiont extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        imGetuiConfigService.delete(ids);
        imGetuiConfigService.delete(ids.split(","));
        return success("删除成功");
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/message/MqMessageEndpoint.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.endpoint.message;
import com.yihu.jw.base.service.MqMessageService;
import com.yihu.jw.base.service.message.MqMessageService;
import com.yihu.jw.entity.base.message.MqMessageDO;
import com.yihu.jw.restmodel.base.message.MqMessageVO;
import com.yihu.jw.restmodel.web.Envelop;
@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.MqMessage.PREFIX)
@Api(value = "基于MQ的消息推送", description = "基于MQ的消息推送服务接口", tags = {"消息服务 - 基于MQ的消息推送服务接口"})
@Api(value = "基于MQ的消息推送", description = "基于MQ的消息推送服务接口", tags = {"wlyy基础服务 - 基于MQ的消息推送服务接口"})
public class MqMessageEndpoint extends EnvelopRestEndpoint {
    @Autowired

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/message/MqMessageSubscriberEndpoint.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.endpoint.message;
import com.yihu.jw.base.service.MqMessageSubscriberService;
import com.yihu.jw.base.service.message.MqMessageSubscriberService;
import com.yihu.jw.entity.base.message.MqMessageSubscriberDO;
import com.yihu.jw.restmodel.base.message.MqMessageSubscriberVO;
import com.yihu.jw.restmodel.web.Envelop;
@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.MqMessageSubscriber.PREFIX)
@Api(value = "基于MQ的消息推送订阅者", description = "基于MQ的消息推送订阅者服务接口", tags = {"消息服务 - 基于MQ的消息推送订阅者服务接口"})
@Api(value = "基于MQ的消息推送订阅者", description = "基于MQ的消息推送订阅者服务接口", tags = {"wlyy基础服务 - 基于MQ的消息推送订阅者服务接口"})
public class MqMessageSubscriberEndpoint extends EnvelopRestEndpoint {
    @Autowired

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/module/ModuleEndpoint.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.endpoint.module;
import com.yihu.jw.base.service.ModuleService;
import com.yihu.jw.base.service.module.ModuleService;
import com.yihu.jw.entity.base.module.ModuleDO;
import com.yihu.jw.restmodel.base.module.ModuleVO;
import com.yihu.jw.restmodel.web.Envelop;
@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.Module.PREFIX)
@Api(value = "模块管理", description = "模块管理服务接口", tags = {"模块和功能 - 模块管理服务接口"})
@Api(value = "模块管理", description = "模块管理服务接口", tags = {"wlyy基础服务 - 模块管理服务接口"})
public class ModuleEndpoint extends EnvelopRestEndpoint {
    @Autowired

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/role/RoleEndpoint.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.endpoint.role;
import com.yihu.jw.base.service.RoleService;
import com.yihu.jw.base.service.role.RoleService;
import com.yihu.jw.entity.base.role.RoleDO;
import com.yihu.jw.restmodel.base.role.RoleVO;
import com.yihu.jw.restmodel.web.Envelop;
@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.Role.PREFIX)
@Api(value = "角色管理", description = "角色管理服务接口", tags = {"角色 - 角色管理服务接口"})
@Api(value = "角色管理", description = "角色管理服务接口", tags = {"wlyy基础服务 - 角色管理服务接口"})
public class RoleEndpoint extends EnvelopRestEndpoint {
    @Autowired

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasDefaultModuleFunctionEndpoint.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.endpoint.saas;
import com.yihu.jw.base.service.SaasDefaultModuleFunctionService;
import com.yihu.jw.base.service.saas.SaasDefaultModuleFunctionService;
import com.yihu.jw.entity.base.saas.SaasDefaultModuleFunctionDO;
import com.yihu.jw.restmodel.base.saas.SaasDefaultModuleFunctionVO;
import com.yihu.jw.restmodel.web.Envelop;
@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.SaasDefaultModuleFunction.PREFIX)
@Api(value = "Saas默认模块功能管理", description = "Saas默认模块功能管理服务接口", tags = {"SAAS - Saas默认模块功能管理服务接口"})
@Api(value = "Saas默认模块功能管理", description = "Saas默认模块功能管理服务接口", tags = {"wlyy基础服务 - Saas默认模块功能管理服务接口"})
public class SaasDefaultModuleFunctionEndpoint extends EnvelopRestEndpoint {
    @Autowired

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasEndpoint.java

@@ -1,8 +1,8 @@
package com.yihu.jw.base.endpoint.saas;
import com.yihu.jw.base.service.UserService;
import com.yihu.jw.base.service.user.UserService;
import com.yihu.jw.entity.base.saas.SaasDO;
import com.yihu.jw.base.service.SaasService;
import com.yihu.jw.base.service.saas.SaasService;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.restmodel.base.saas.SaasVO;
import com.yihu.jw.restmodel.web.Envelop;
@@ -25,7 +25,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.Saas.PREFIX)
@Api(value = "Saas管理", description = "Saas管理服务接口", tags = {"SAAS - Saas管理服务接口"})
@Api(value = "Saas管理", description = "Saas管理服务接口", tags = {"wlyy基础服务 - Saas管理服务接口"})
public class SaasEndpoint extends EnvelopRestEndpoint {
    @Autowired

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasModuleFunctionEndpoint.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.endpoint.saas;
import com.yihu.jw.base.service.SaasModuleFunctionService;
import com.yihu.jw.base.service.saas.SaasModuleFunctionService;
import com.yihu.jw.entity.base.saas.SaasModuleFunctionDO;
import com.yihu.jw.restmodel.base.saas.SaasModuleFunctionVO;
import com.yihu.jw.restmodel.web.Envelop;
@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.RoleModuleFunction.PREFIX)
@Api(value = "Saas模块功能管理", description = "Saas模块功能管理服务接口", tags = {"SAAS - Saas模块功能管理服务接口"})
@Api(value = "Saas模块功能管理", description = "Saas模块功能管理服务接口", tags = {"wlyy基础服务 - Saas模块功能管理服务接口"})
public class SaasModuleFunctionEndpoint extends EnvelopRestEndpoint {
    @Autowired

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

@@ -31,40 +31,25 @@ public class RehabilitationEndpoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "创建")
    public Envelop create (
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestBody String jsonData) {
        try {
            RehabilitationVO rehabilitationVO = toEntity(jsonData, RehabilitationVO.class);
            ServicePackageSignRecordDO signRecordDO = convertToModel(rehabilitationVO.getSignRecordVO(), ServicePackageSignRecordDO.class);
            ServicePackageDO servicePackageDO = servicePackageService.addRehabilitation(rehabilitationVO,signRecordDO);
            return success(convertToModel(servicePackageDO, ServicePackageVO.class));
        }catch (Exception e){
            e.printStackTrace();
            return Envelop.getError("创建失败");
        }
            @RequestBody String jsonData) throws Exception{
        RehabilitationVO rehabilitationVO = toDateEntity(jsonData, RehabilitationVO.class);
        ServicePackageSignRecordDO signRecordDO = convertToModel(rehabilitationVO.getSignRecordVO(), ServicePackageSignRecordDO.class);
        ServicePackageDO servicePackageDO = servicePackageService.addRehabilitation(rehabilitationVO,signRecordDO);
        return success(convertToModel(servicePackageDO, ServicePackageVO.class));
    }
    @PostMapping(value = BaseRequestMapping.BaseRehabilitation.CREATELOG)
    @ApiOperation(value = "新增服务包日志")
    public Envelop addRehabilitationLog(@ApiParam(name = "jsonData", value = "Json数据", required = true)
                          @RequestBody String jsonData){
        try{
            ServicePackageLogVO logVO = toEntity(jsonData,ServicePackageLogVO.class);
            return success(servicePackageService.addRehabilitationLog(logVO));
        }catch (Exception e){
            e.printStackTrace();
            return Envelop.getError("新增失败");
        }
                          @RequestBody String jsonData) throws Exception{
        ServicePackageLogVO logVO = toEntity(jsonData,ServicePackageLogVO.class);
        return success(servicePackageService.addRehabilitationLog(logVO));
    }
    @GetMapping(value = BaseRequestMapping.BaseRehabilitation.FINDBYID)
    @ApiOperation(value = "查找完成度")
    public Envelop getFinish(@ApiParam(name = "servicePackId", value = "服务包id", required = true)
                             @RequestParam(value = "servicePackId") String servicePackId){
        try {
            return success(servicePackageService.getFinish(servicePackId));
        }catch (Exception e){
            e.printStackTrace();
            return Envelop.getError("获取失败");
        }
                             @RequestParam(value = "servicePackId") String servicePackId) throws Exception{
        return success(servicePackageService.getFinish(servicePackId));
    }
}

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

@@ -43,22 +43,22 @@ public class ServicePackageEndpoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "删除")
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        servicePackageService.delete(ids);
            @RequestParam(value = "ids") String ids) throws Exception{
        servicePackageService.delete(ids.split(","));
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.ServicePackage.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<ServicePackageVO> update (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        ServicePackageDO servicePackageDO = toEntity(jsonData, ServicePackageDO.class);
        if (null == servicePackageDO.getId()) {
            return failed("ID不能为空", ObjEnvelop.class);
        }
        servicePackageDO = servicePackageService.save(servicePackageDO);
        return success(convertToModel(servicePackageDO, ServicePackageVO.class));
        return success(servicePackageDO, ServicePackageVO.class);
    }
    @GetMapping(value = BaseRequestMapping.ServicePackage.PAGE)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/sms/SmsGatewayEndpoint.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.endpoint.sms;
import com.yihu.jw.base.service.SmsGatewayService;
import com.yihu.jw.base.service.sms.SmsGatewayService;
import com.yihu.jw.entity.base.sms.SmsDO;
import com.yihu.jw.entity.base.sms.SmsGatewayDO;
import com.yihu.jw.entity.base.sms.SmsTemplateDO;
@@ -27,7 +27,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.SmsGateway.PREFIX)
@Api(value = "短信网关管理", description = "短信网关管理服务接口", tags = {"短信服务 - 短信网关管理服务接口"})
@Api(value = "短信网关管理", description = "短信网关管理服务接口", tags = {"wlyy基础服务 - 短信网关管理服务接口"})
public class SmsGatewayEndpoint extends EnvelopRestEndpoint {
    @Autowired

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/sms/SmsTemplateEndpoint.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.endpoint.sms;
import com.yihu.jw.base.service.SmsTemplateService;
import com.yihu.jw.base.service.sms.SmsTemplateService;
import com.yihu.jw.entity.base.sms.SmsTemplateDO;
import com.yihu.jw.restmodel.base.sms.SmsTemplateVO;
import com.yihu.jw.restmodel.web.Envelop;
@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.SmsTemplate.PREFIX)
@Api(value = "短信模板管理", description = "短信模板管理服务接口", tags = {"短信服务 - 短信模板管理服务接口"})
@Api(value = "短信模板管理", description = "短信模板管理服务接口", tags = {"wlyy基础服务 - 短信模板管理服务接口"})
public class SmsTemplateEndpoint extends EnvelopRestEndpoint {
    @Autowired

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/statistics/DimensionEndpoint.java

@@ -45,7 +45,7 @@ public class DimensionEndpoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        dimensionService.delete(ids);
        dimensionService.delete(ids.split(","));
        return success("删除成功");
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/statistics/JobConfigEndpoint.java

@@ -45,7 +45,7 @@ public class JobConfigEndpoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        jobConfigService.delete(ids);
        jobConfigService.delete(ids.split(","));
        return success("删除成功");
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/statistics/QuotaEndpoint.java

@@ -37,7 +37,7 @@ public class QuotaEndpoint extends EnvelopRestEndpoint {
            @RequestBody String jsonData) throws Exception {
        QuotaDO quotaDO = toEntity(jsonData, QuotaDO.class);
        quotaDO = quotaService.save(quotaDO);
        return success(convertToModel(quotaDO, QuotaVO.class));
        return success(quotaDO, QuotaVO.class);
    }
    @PostMapping(value = BaseRequestMapping.Quota.DELETE)
@@ -45,7 +45,7 @@ public class QuotaEndpoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        quotaService.delete(ids);
        quotaService.delete(ids.split(","));
        return success("删除成功");
    }
@@ -59,7 +59,7 @@ public class QuotaEndpoint extends EnvelopRestEndpoint {
            return failed("ID不能为空", ObjEnvelop.class);
        }
        quotaDO = quotaService.save(quotaDO);
        return success(convertToModel(quotaDO, QuotaVO.class));
        return success(quotaDO, QuotaVO.class);
    }
    @GetMapping(value = BaseRequestMapping.Quota.PAGE)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/system/SystemDictEndpoint.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.endpoint.system;
import com.yihu.jw.base.service.SystemDictService;
import com.yihu.jw.base.service.system.SystemDictService;
import com.yihu.jw.entity.base.system.SystemDictDO;
import com.yihu.jw.restmodel.base.system.SystemDictVO;
import com.yihu.jw.restmodel.web.Envelop;
@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.SystemDict.PREFIX)
@Api(value = "系统字典", description = "系统字典服务接口", tags = {"系统字典 - 系统字典服务接口"})
@Api(value = "系统字典", description = "系统字典服务接口", tags = {"wlyy基础服务 - 系统字典服务接口"})
public class SystemDictEndpoint extends EnvelopRestEndpoint {
    
    @Autowired

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/system/SystemDictEntryEndpoint.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.endpoint.system;
import com.yihu.jw.base.service.SystemDictEntryService;
import com.yihu.jw.base.service.system.SystemDictEntryService;
import com.yihu.jw.entity.base.system.SystemDictEntryDO;
import com.yihu.jw.restmodel.base.system.SystemDictEntryVO;
import com.yihu.jw.restmodel.web.Envelop;
@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.SystemDictEntry.PREFIX)
@Api(value = "系统字典项", description = "系统字典项服务接口", tags = {"系统字典 - 系统字典项服务接口"})
@Api(value = "系统字典项", description = "系统字典项服务接口", tags = {"wlyy基础服务 - 系统字典项服务接口"})
public class SystemDictEntryEndpoint extends EnvelopRestEndpoint {
    
    @Autowired

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/theme/ThemeEndpoint.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.endpoint.theme;
import com.yihu.jw.base.service.ThemeService;
import com.yihu.jw.base.service.theme.ThemeService;
import com.yihu.jw.entity.base.theme.ThemeDO;
import com.yihu.jw.restmodel.base.theme.ThemeVO;
import com.yihu.jw.restmodel.web.Envelop;
@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.Theme.PREFIX)
@Api(value = "主题应用", description = "主题应用服务接口", tags = {"主题风格 - 主题应用服务接口"})
@Api(value = "主题应用", description = "主题应用服务接口", tags = {"wlyy基础服务 - 主题应用服务接口"})
public class ThemeEndpoint extends EnvelopRestEndpoint {
    @Autowired

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/user/UserEndpoint.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.endpoint.user;
import com.yihu.jw.base.service.UserService;
import com.yihu.jw.base.service.user.UserService;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.restmodel.base.user.UserVO;
import com.yihu.jw.restmodel.web.Envelop;
@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.User.PREFIX)
@Api(value = "用户管理", description = "用户管理服务接口", tags = {"用户 - 用户管理服务接口"})
@Api(value = "用户管理", description = "用户管理服务接口", tags = {"wlyy基础服务 - 用户管理服务接口"})
public class UserEndpoint extends EnvelopRestEndpoint {
    @Autowired

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/user/UserHideModuleFunctionEndpoint.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.endpoint.user;
import com.yihu.jw.base.service.UserHideModuleFunctionService;
import com.yihu.jw.base.service.user.UserHideModuleFunctionService;
import com.yihu.jw.entity.base.user.UserHideModuleFunctionDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
@@ -18,11 +18,12 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
 * Endpoint - 用户模块功能管理
 * Created by progr1mmer on 2018/8/16.
 */
@RestController
@RequestMapping(value = BaseRequestMapping.UserHideModuleFunction.PREFIX)
@Api(value = "用户模块功能管理", description = "用户模块功能管理服务接口", tags = {"用户 - 用户模块功能管理服务接口"})
@Api(value = "用户模块功能管理", description = "用户模块功能管理服务接口", tags = {"wlyy基础服务 - 用户模块功能管理服务接口"})
public class UserHideModuleFunctionEndpoint extends EnvelopRestEndpoint {
    @Autowired

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/user/UserRoleEndpoint.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.endpoint.user;
import com.yihu.jw.base.service.UserRoleService;
import com.yihu.jw.base.service.user.UserRoleService;
import com.yihu.jw.entity.base.user.UserRoleDO;
import com.yihu.jw.restmodel.base.user.UserRoleVO;
import com.yihu.jw.restmodel.web.Envelop;
@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.UserRole.PREFIX)
@Api(value = "用户角色管理", description = "用户角色管理服务接口", tags = {"用户 - 用户角色管理服务接口"})
@Api(value = "用户角色管理", description = "用户角色管理服务接口", tags = {"wlyy基础服务 - 用户角色管理服务接口"})
public class UserRoleEndpoint extends EnvelopRestEndpoint {
    @Autowired

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

@@ -1,12 +0,0 @@
package com.yihu.jw.base.service;
import com.yihu.jw.base.dao.BaseOrgDao;
import com.yihu.jw.entity.base.org.BaseOrg;
import com.yihu.mysql.query.BaseJpaService;
/**
 * @author litaohong on 2018/8/29
 * @project jw2.0
 */
public class BaseOrgService extends BaseJpaService<BaseOrg, BaseOrgDao> {
}

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

@@ -1,6 +1,6 @@
package com.yihu.jw.base.service;
package com.yihu.jw.base.service.function;
import com.yihu.jw.base.dao.FunctionDao;
import com.yihu.jw.base.dao.function.FunctionDao;
import com.yihu.jw.entity.base.function.FunctionDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;

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

@@ -1,6 +1,6 @@
package com.yihu.jw.base.service;
package com.yihu.jw.base.service.message;
import com.yihu.jw.base.dao.MqMessageDao;
import com.yihu.jw.base.dao.message.MqMessageDao;
import com.yihu.jw.entity.base.message.MqMessageDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;

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

@@ -1,6 +1,6 @@
package com.yihu.jw.base.service;
package com.yihu.jw.base.service.message;
import com.yihu.jw.base.dao.MqMessageSubscriberDao;
import com.yihu.jw.base.dao.message.MqMessageSubscriberDao;
import com.yihu.jw.entity.base.message.MqMessageSubscriberDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;

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

@@ -1,7 +1,7 @@
package com.yihu.jw.base.service;
package com.yihu.jw.base.service.module;
import com.yihu.jw.entity.base.module.ModuleDO;
import com.yihu.jw.base.dao.ModuleDao;
import com.yihu.jw.base.dao.module.ModuleDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

@@ -1,6 +1,6 @@
package com.yihu.jw.base.service;
package com.yihu.jw.base.service.role;
import com.yihu.jw.base.dao.RoleDao;
import com.yihu.jw.base.dao.role.RoleDao;
import com.yihu.jw.entity.base.role.RoleDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;

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

@@ -1,6 +1,6 @@
package com.yihu.jw.base.service;
package com.yihu.jw.base.service.saas;
import com.yihu.jw.base.dao.SaasDefaultModuleFunctionDao;
import com.yihu.jw.base.dao.saas.SaasDefaultModuleFunctionDao;
import com.yihu.jw.entity.base.saas.SaasDefaultModuleFunctionDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;

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

@@ -1,6 +1,6 @@
package com.yihu.jw.base.service;
package com.yihu.jw.base.service.saas;
import com.yihu.jw.base.dao.SaasModuleFunctionDao;
import com.yihu.jw.base.dao.saas.SaasModuleFunctionDao;
import com.yihu.jw.entity.base.saas.SaasModuleFunctionDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;

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

@@ -1,6 +1,11 @@
package com.yihu.jw.base.service;
package com.yihu.jw.base.service.saas;
import com.yihu.jw.base.dao.*;
import com.yihu.jw.base.dao.role.RoleDao;
import com.yihu.jw.base.dao.saas.SaasDao;
import com.yihu.jw.base.dao.saas.SaasDefaultModuleFunctionDao;
import com.yihu.jw.base.dao.saas.SaasModuleFunctionDao;
import com.yihu.jw.base.dao.user.UserDao;
import com.yihu.jw.base.dao.user.UserRoleDao;
import com.yihu.jw.entity.base.role.RoleDO;
import com.yihu.jw.entity.base.saas.SaasDO;
import com.yihu.jw.entity.base.saas.SaasDefaultModuleFunctionDO;

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

@@ -1,9 +1,9 @@
package com.yihu.jw.base.service;
package com.yihu.jw.base.service.sms;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.dao.SmsDao;
import com.yihu.jw.base.dao.SmsGatewayDao;
import com.yihu.jw.base.dao.SmsTemplateDao;
import com.yihu.jw.base.dao.sms.SmsDao;
import com.yihu.jw.base.dao.sms.SmsGatewayDao;
import com.yihu.jw.base.dao.sms.SmsTemplateDao;
import com.yihu.jw.entity.base.sms.SmsDO;
import com.yihu.jw.entity.base.sms.SmsGatewayDO;
import com.yihu.jw.entity.base.sms.SmsTemplateDO;
@@ -19,7 +19,6 @@ import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.MalformedParameterizedTypeException;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

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

@@ -1,6 +1,6 @@
package com.yihu.jw.base.service;
package com.yihu.jw.base.service.sms;
import com.yihu.jw.base.dao.SmsTemplateDao;
import com.yihu.jw.base.dao.sms.SmsTemplateDao;
import com.yihu.jw.entity.base.sms.SmsTemplateDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;

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

@@ -1,6 +1,6 @@
package com.yihu.jw.base.service;
package com.yihu.jw.base.service.system;
import com.yihu.jw.base.dao.SystemDictEntryDao;
import com.yihu.jw.base.dao.system.SystemDictEntryDao;
import com.yihu.jw.entity.base.system.SystemDictEntryDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;

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

@@ -1,7 +1,7 @@
package com.yihu.jw.base.service;
package com.yihu.jw.base.service.system;
import com.yihu.jw.entity.base.system.SystemDictDO;
import com.yihu.jw.base.dao.SystemDictDao;
import com.yihu.jw.base.dao.system.SystemDictDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;

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

@@ -1,6 +1,6 @@
package com.yihu.jw.base.service;
package com.yihu.jw.base.service.theme;
import com.yihu.jw.base.dao.ThemeDao;
import com.yihu.jw.base.dao.theme.ThemeDao;
import com.yihu.jw.entity.base.theme.ThemeDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;

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

@@ -1,6 +1,6 @@
package com.yihu.jw.base.service;
package com.yihu.jw.base.service.user;
import com.yihu.jw.base.dao.UserHideModuleFunctionDao;
import com.yihu.jw.base.dao.user.UserHideModuleFunctionDao;
import com.yihu.jw.entity.base.user.UserHideModuleFunctionDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;

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

@@ -1,6 +1,6 @@
package com.yihu.jw.base.service;
package com.yihu.jw.base.service.user;
import com.yihu.jw.base.dao.UserRoleDao;
import com.yihu.jw.base.dao.user.UserRoleDao;
import com.yihu.jw.entity.base.user.UserRoleDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;

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

@@ -1,6 +1,6 @@
package com.yihu.jw.base.service;
package com.yihu.jw.base.service.user;
import com.yihu.jw.base.dao.UserDao;
import com.yihu.jw.base.dao.user.UserDao;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.utils.security.MD5;

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/ActiveRecordService.java

@@ -26,7 +26,7 @@ import java.util.Map;
 **/
@Service
@Transactional
public class ActiveRecordService extends BaseJpaService<ActiveRecordDO,ActiveRecordDO> {
public class ActiveRecordService extends BaseJpaService<ActiveRecordDO, ActiveRecordDao> {
    @Autowired
    private TaskDao taskDao;

svr/svr-wlyy-specialist/pom.xml

@@ -121,6 +121,12 @@
            <artifactId>jxl</artifactId>
            <version>2.6</version>
        </dependency>
        <!--<dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-util</artifactId>
            <version>1.1.0</version>
            <scope>compile</scope>
        </dependency>-->
    </dependencies>
    <build>

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/controller/rehabilitation/RehabilitationManageController.java

@@ -279,4 +279,21 @@ public class RehabilitationManageController {
            return ObjEnvelop.getError(e.getMessage());
        }
    }
    @PostMapping(value = SpecialistMapping.rehabilitation.updateNoteAndImageRehabilitationOperate)
    @ApiOperation(value = "康复计划完成时更新服务完成笔记和图片接口.")
    public Envelop updateNoteAndImageRehabilitationOperate(@ApiParam(name = "planDetailId", value = "服务项目id", required = true)@RequestParam(value = "planDetailId", required = true)String planDetailId,
                                                           @ApiParam(name = "node", value = "服务完成笔记", required = true)@RequestParam(value = "node", required = true)String node,
                                                           @ApiParam(name = "image", value = "相关记录图片，json格式", required = true)@RequestParam(value = "image", required = true)String image){
        try {
            if(rehabilitationManageService.updateNodeAndRelationRecordImg(node,image,planDetailId)>0){
                return Envelop.getSuccess(SpecialistMapping.api_success);
            }
            return Envelop.getError("update error!");
        }catch (Exception e){
            e.printStackTrace();
            tracer.getCurrentSpan().logEvent(e.getMessage());
            return ObjEnvelop.getError(e.getMessage());
        }
    }
}

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/dao/rehabilitation/RehabilitationOperateRecordsDao.java

@@ -18,4 +18,8 @@ public interface RehabilitationOperateRecordsDao extends PagingAndSortingReposit
    @Modifying
    @Query("update RehabilitationOperateRecordsDO a set a.status=?1 where a.rehabilitationDetailId =?2 ")
    int updateStatus(Integer status,String rehabilitationDetailId);
    @Modifying
    @Query("update RehabilitationOperateRecordsDO a set a.node=?1,a.relationRecordImg=?2 where a.rehabilitationDetailId =?3 ")
    int updateNodeAndRelationRecordImg(String node,String rehabilitationRecordImg,String rehabilitataioDetailId);
}

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/rehabilitation/RehabilitationManageService.java

@@ -1024,4 +1024,8 @@ public class RehabilitationManageService {
        List<Map<String,Object>> list = rehabilitationDetailDao.dailyJob(startTime,endTime);
        return ObjEnvelop.getSuccess(SpecialistMapping.api_success,list);
    }
    public int updateNodeAndRelationRecordImg(String node,String image,String planDeatilId){
        return rehabilitationOperateRecordsDao.updateNodeAndRelationRecordImg(node,image,planDeatilId);
    }
}

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/rehabilitation/RehabilitationPlanService.java

@@ -1,13 +1,19 @@
package com.yihu.jw.service.rehabilitation;
import com.yihu.jw.dao.rehabilitation.*;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.dao.rehabilitation.PatientRehabilitationPlanDao;
import com.yihu.jw.dao.rehabilitation.RehabilitationDetailDao;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.jw.dao.rehabilitation.PatientRehabilitationPlanDao;
import com.yihu.jw.entity.rehabilitation.RehabilitationPlanningDO;
import com.yihu.jw.dao.rehabilitation.RehabilitationPlanTemplateDao;
import com.yihu.jw.dao.rehabilitation.RehabilitationTemplateDetailDao;
import com.yihu.jw.entity.specialist.HospitalServiceItemDO;
import com.yihu.jw.entity.specialist.rehabilitation.*;
import com.yihu.jw.entity.specialist.rehabilitation.PatientRehabilitationPlanDO;
import com.yihu.jw.entity.specialist.rehabilitation.RehabilitationDetailDO;
import com.yihu.jw.entity.specialist.rehabilitation.RehabilitationPlanTemplateDO;
@@ -21,6 +27,8 @@ import com.yihu.jw.service.SpecialistHospitalServiceItemService;
import com.yihu.jw.service.SpecialistService;
import com.yihu.jw.util.common.QrcodeUtil;
import com.yihu.fastdfs.FastDFSUtil;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -35,13 +43,15 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.*;
import java.util.*;
/**
 * Created by humingfen on 2018/8/17.
 */
@Service
@Transactional
public class RehabilitationPlanService {
public class RehabilitationPlanService extends BaseJpaService<RehabilitationPlanningDO, RehabilitationPlanningDO> {
    @Value("${neiwang.enable}")
    private Boolean isneiwang;  //如果不是内网项目要转到到内网wlyy在上传
@@ -64,6 +74,8 @@ public class RehabilitationPlanService {
    @Autowired
    protected HttpServletRequest request;
    @Autowired
    private RehabilitationOperateRecordsDao rehabilitationOperateRecordsDao;
    @Autowired
    private SpecialistHospitalServiceItemService hospitalServiceItemService;
    @Autowired
    private SpecialistService specialistService;
@@ -202,14 +214,14 @@ public class RehabilitationPlanService {
        return MixEnvelop.getSuccess(SpecialistMapping.api_success, jsonArray);
    }
    public MixEnvelop<String,String> createServiceQrCode(String planDetailId){
    public MixEnvelop<String,String> createServiceQrCode(String planDetailId,String sessionId){
        RehabilitationDetailDO rehabilitationDetailDO = rehabilitationDetailDao.findById(planDetailId);
        String fileUrl = "";
        if (rehabilitationDetailDO!=null) {
            if (org.apache.commons.lang3.StringUtils.isNotBlank(rehabilitationDetailDO.getServiceQrCode())) {
                fileUrl = rehabilitationDetailDO.getServiceQrCode();
            } else {
                String contentJsonStr="{\"planDetailId\":\""+planDetailId+"\"}";
                String contentJsonStr="{\"planDetailId\":\""+planDetailId+"\",\"sessionId\":\""+sessionId+"\"}";
                InputStream ipt = QrcodeUtil.createQrcode(contentJsonStr, 300, "png");
                isneiwang = false;
                if (isneiwang) {
@@ -249,7 +261,7 @@ public class RehabilitationPlanService {
        return MixEnvelop.getSuccess("获取二维码成功！",fileUrl);
    }
    public Integer checkAfterQrCode(String planDetailId,String patietCode){
    public Integer checkAfterQrCode(String planDetailId,String patietCode)throws Exception{
        int result = 0;
        String sql ="SELECT rp.patient FROM `wlyy_rehabilitation_plan_detail` pd LEFT JOIN wlyy_patient_rehabilitation_plan rp ON pd.plan_id = rp.id WHERE pd.id='"+planDetailId+"'";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
@@ -264,4 +276,12 @@ public class RehabilitationPlanService {
        }
        return result;
    }
    public RehabilitationOperateRecordsDO saveRehabilitationRecord(RehabilitationOperateRecordsDO rehabilitationOperateRecordsDO){
        RehabilitationDetailDO rehabilitationDetailDO = rehabilitationDetailDao.findById(rehabilitationOperateRecordsDO.getRehabilitationDetailId());
        rehabilitationOperateRecordsDO.setId(getCode());
        rehabilitationOperateRecordsDO.setReserveTime(rehabilitationDetailDO.getExecuteTime());
        rehabilitationOperateRecordsDO.setCompleteTime(new Date());
        return rehabilitationOperateRecordsDao.save(rehabilitationOperateRecordsDO);
    }
}

svr/svr-wlyy-specialist/src/main/resources/application.yml

@@ -86,6 +86,9 @@ neiwang:
  enable: true
  wlyy: http://localhost:10051/
base:
  url: http://172.17.110.212:10020/
---
spring:
  profiles: jwtest
@@ -104,6 +107,9 @@ fast-dfs:
neiwang:
  enable: false
  wlyy: http://59.61.92.90:10051/
base:
  url: http://172.17.110.212:10020/
---
spring:
  profiles: jwdevtest
@@ -122,6 +128,9 @@ fast-dfs:
neiwang:
  enable: true
  wlyy: http://172.19.103.88:10051/svr-slyy-specialist/
base:
  url: http://172.17.110.212:10020/
---
spring:
  profiles: prod