Merge branch 'dev' of suhaiwen/wlyy2.0 into dev

app/public-health-server/src/main/java/com/yihu/health/security/core/EhrWebAuthenticationProvider.java

@@ -157,8 +157,8 @@ public class EhrWebAuthenticationProvider extends AbstractUserDetailsAuthenticat
//import org.springframework.security.authentication.BadCredentialsException;
//import org.springframework.security.authentication.InternalAuthenticationServiceException;
//import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
//import org.springframework.security.authentication.dao.AbstractUserDetailsAuthenticationProvider;
//import org.springframework.security.authentication.dao.SaltSource;
//import org.springframework.security.authentication.dict.AbstractUserDetailsAuthenticationProvider;
//import org.springframework.security.authentication.dict.SaltSource;
//import org.springframework.security.authentication.encoding.PasswordEncoder;
//import org.springframework.security.authentication.encoding.PlaintextPasswordEncoder;
//import org.springframework.security.core.AuthenticationException;

business/base-service/src/main/java/com/yihu/jw/doctor/service/BaseDoctorService.java

@@ -1,8 +1,8 @@
//package com.yihu.jw.doctor.service;
//
//import com.alibaba.fastjson.JSON;
//import com.yihu.jw.doctor.dao.BaseDoctorDao;
//import com.yihu.jw.doctor.dao.DoctorSpecialDiseaseDao;
//import com.yihu.jw.doctor.dict.BaseDoctorDao;
//import com.yihu.jw.doctor.dict.DoctorSpecialDiseaseDao;
//import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
//import com.yihu.jw.entity.base.doctor.DoctorSpecialDiseaseDo;
//import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;

business/base-service/src/main/java/com/yihu/jw/wechat/dao/WxTemplateDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.wechat.dao;//package com.yihu.jw.business.wx.dao;
package com.yihu.jw.wechat.dao;//package com.yihu.jw.business.wx.dict;
import com.yihu.jw.entity.base.wx.WxTemplateDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

common/common-request-mapping/src/main/java/com/yihu/jw/rm/iot/IotRequestMapping.java

@@ -50,6 +50,7 @@ public class IotRequestMapping {
        public static final String findDictByCode = "findDictByCode";
        public static final String createDict = "createDict";
        public static final String getListByParentCode = "getListByParentCode";
        public static final String findByDictName = "findByDictName";
    }
    /**
@@ -201,6 +202,7 @@ public class IotRequestMapping {
        public static final String api_update = "updateDeviceDict";
        public static final String api_queryPage = "queryDeviceDictPage";
        public static final String api_getList = "getDeviceDictList";
        public static final String api_findByDictName = "api_findByDictName";
        public static final String message_success_update = "deviceDict update success";
        public static final String message_success_delete = "deviceDict delete success";
@@ -262,6 +264,7 @@ public class IotRequestMapping {
        public static final String conditionQueryPage = "conditionQueryPage";
        public static final String findAllSim = "findAllSim";
        public static final String remind = "remind";
        public static final String findRemind = "findRemind";
        public static final String message_success_add = "sim add success";
        public static final String message_success_edit = "sim edit success";
@@ -448,4 +451,7 @@ public class IotRequestMapping {
        public static final String message_success_create = "hospital create success";
        public static final String message_success_delete = "hospital delete success";
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/iot/dict/IotSystemDictVO.java

@@ -18,6 +18,10 @@ public class IotSystemDictVO implements Serializable {
    private String code;//
    @ApiModelProperty("字典项值")
    private String value;//
    @ApiModelProperty("字典时间")
    private String time;
    @ApiModelProperty("字典状态")
    private Integer status;
    public String getCode() {
        return code;
@@ -35,4 +39,19 @@ public class IotSystemDictVO implements Serializable {
        this.value = value;
    }
    public String getTime() {
        return time;
    }
    public void setTime(String time) {
        this.time = time;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
}

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

@@ -44,19 +44,10 @@ public class MixEnvelop<T, J> extends Envelop {
    @ApiModelProperty(value = "列表内容")
    private List<T> detailModelList = new ArrayList<>(0);
    @ApiModelProperty(value = "列表内容")
    private Map<T,T> detailModelMap = new HashMap<>(0);
    @ApiModelProperty(value = "实体内容")
    private J obj = (J)new HashMap<>(0);
    public Map<T, T> getDetailModelMap() {
        return detailModelMap;
    }
    public void setDetailModelMap(Map<T, T> detailModelMap) {
        this.detailModelMap = detailModelMap;
    }
    public int getCurrPage() {
        return currPage;
@@ -145,16 +136,6 @@ public class MixEnvelop<T, J> extends Envelop {
        envelop.setTotalCount(count.intValue());
        return envelop;
    }
    public static MixEnvelop getSuccessMapWithPage(String message, Map detailModelMap, int page, int size, Long count) {
        MixEnvelop envelop = new MixEnvelop();
        envelop.setMessage(message);
        envelop.setPageSize(size);
        envelop.setDetailModelMap(detailModelMap);
        envelop.setCurrPage(page);
        envelop.setStatus(200);
        envelop.setTotalCount(count.intValue());
        return envelop;
    }
    public static MixEnvelop getError(String message, int errorCode) {
        MixEnvelop envelop = new MixEnvelop();

svr/figure-label/src/main/java/com/yihu/wlyy/figure/label/config/db/FigureLabelJpa.java

@@ -33,7 +33,7 @@ import java.util.Properties;
@EnableJpaRepositories(
        entityManagerFactoryRef = "EntityManagerFactory",
        transactionManagerRef = "TransactionManager",
        basePackages = {"com.yihu.wlyy.figure.label.dao"})   //设置Repository所在位置
        basePackages = {"com.yihu.wlyy.figure.label.dict"})   //设置Repository所在位置
public class FigureLabelJpa {
    @Autowired

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

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

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

@@ -1,4 +1,4 @@
//package com.yihu.jw.base.dao.dict;
//package com.yihu.jw.base.dict.dict;
//
//import com.yihu.jw.entity.base.dict.DictDiseaseDO;
//import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;

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

@@ -1,4 +1,4 @@
//package com.yihu.jw.base.dao.doctor;
//package com.yihu.jw.base.dict.doctor;
//
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

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

@@ -1,4 +1,4 @@
//package com.yihu.jw.base.dao.doctor;
//package com.yihu.jw.base.dict.doctor;
//
//import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

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

@@ -1,4 +1,4 @@
//package com.yihu.jw.base.dao.function;
//package com.yihu.jw.base.dict.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/org/BaseOrgDao.java

@@ -1,4 +1,4 @@
//package com.yihu.jw.base.dao.org;
//package com.yihu.jw.base.dict.org;
//
//import com.yihu.jw.entity.base.org.BaseOrgDO;
//import org.springframework.data.domain.Pageable;

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

@@ -1,4 +1,4 @@
//package com.yihu.jw.base.dao.saas;
//package com.yihu.jw.base.dict.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/saas/SaasModuleFunctionDao.java

@@ -1,4 +1,4 @@
//package com.yihu.jw.base.dao.saas;
//package com.yihu.jw.base.dict.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/version/AppVersionDao.java

@@ -1,4 +1,4 @@
//package com.yihu.jw.base.dao.version;
//package com.yihu.jw.base.dict.version;
//
//import com.yihu.jw.entity.base.version.AppVersionDO;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao.wx;//package com.yihu.jw.business.wx.dao;
package com.yihu.jw.base.dao.wx;//package com.yihu.jw.business.wx.dict;
import com.yihu.jw.entity.base.wx.WxGraphicMessageDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

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

@@ -1,6 +1,6 @@
//package com.yihu.jw.base.service.function;
//
//import com.yihu.jw.base.dao.function.FunctionDao;
//import com.yihu.jw.base.dict.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/patient/PatientFamilyMemberService.java

@@ -1,9 +1,9 @@
//package com.yihu.jw.base.service.patient;
//
//import com.yihu.jw.base.dao.patient.BasePatientFamilyMemberDao;
//import com.yihu.jw.base.dict.patient.BasePatientFamilyMemberDao;
//import com.yihu.jw.entity.base.patient.BasePatientDO;
//import com.yihu.jw.entity.base.patient.BasePatientFamilyMemberDO;
//import com.yihu.jw.patient.dao.BasePatientDao;
//import com.yihu.jw.patient.dict.BasePatientDao;
//import com.yihu.jw.restmodel.web.Envelop;
//import com.yihu.jw.util.idcard.IdCardUtil;
//import com.yihu.mysql.query.BaseJpaService;

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

@@ -1,7 +1,7 @@
//package com.yihu.jw.base.service.saas;
//
//import com.yihu.jw.base.dao.saas.SaasDefaultModuleFunctionDao;
//import com.yihu.jw.base.dao.saas.SaasTypeDictDao;
//import com.yihu.jw.base.dict.saas.SaasDefaultModuleFunctionDao;
//import com.yihu.jw.base.dict.saas.SaasTypeDictDao;
//import com.yihu.jw.entity.base.saas.SaasDefaultModuleFunctionDO;
//import com.yihu.mysql.query.BaseJpaService;
//import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,6 +1,6 @@
//package com.yihu.jw.base.service.saas;
//
//import com.yihu.jw.base.dao.saas.SaasModuleFunctionDao;
//import com.yihu.jw.base.dict.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/version/AppVersionService.java

@@ -1,6 +1,6 @@
//package com.yihu.jw.base.service.version;
//
//import com.yihu.jw.base.dao.version.AppVersionDao;
//import com.yihu.jw.base.dict.version.AppVersionDao;
//import com.yihu.jw.entity.base.version.AppVersionDO;
//import com.yihu.mysql.query.BaseJpaService;
//import org.springframework.stereotype.Service;

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

@@ -5,8 +5,8 @@
//import com.yihu.jw.exception.ApiException;
//import com.yihu.jw.exception.code.ExceptionCode;
//import com.yihu.jw.rm.base.WechatRequestMapping;
//import com.yihu.jw.wechat.dao.WechatDao;
//import com.yihu.jw.wechat.dao.WxAccessTokenDao;
//import com.yihu.jw.wechat.dict.WechatDao;
//import com.yihu.jw.wechat.dict.WxAccessTokenDao;
//import com.yihu.mysql.query.BaseJpaService;
//import com.yihu.utils.network.HttpUtils;
//import org.json.JSONObject;

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

@@ -1,7 +1,7 @@
package com.yihu.jw.base.service.wx;//package com.yihu.jw.business.wx.service;
//
//import com.yihu.jw.base.wx.WxGraphicMessageDO;
//import com.yihu.jw.business.wx.dao.WxGraphicMessageDao;
//import com.yihu.jw.business.wx.dict.WxGraphicMessageDao;
//import com.yihu.jw.exception.ApiException;
//import com.yihu.jw.exception.code.ExceptionCode;
//import com.yihu.base.mysql.query.BaseJpaService;

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/config/jpa/WlyyHouseJpa.java

@@ -25,7 +25,7 @@
//@EnableJpaRepositories(
//        entityManagerFactoryRef = "wlyyHouseEntityManagerFactory",
//        transactionManagerRef = "wlyyHouseTransactionManager",
//        basePackages = {"com.yihu.jw.healthyhouse.dao"})   //设置Repository所在位置
//        basePackages = {"com.yihu.jw.healthyhouse.dict"})   //设置Repository所在位置
//public class WlyyHouseJpa {
//
//    @Autowired

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/facility/FacilityServerRelationDao.java

@@ -7,7 +7,7 @@ import org.springframework.data.jpa.repository.Modifying;
import java.util.List;
/**
 * 设施与服务关系 dao
 * 设施与服务关系 dict
 * @author zdm
 * @version 1.0
 * @created 2018.09.20

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/user/FacilityUsedRecordDao.java

@@ -4,7 +4,7 @@ import com.yihu.jw.healthyhouse.model.user.FacilityUsedRecord;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * 用户导航记录 dao
 * 用户导航记录 dict
 * @author zdm
 * @version 1.0
 * @created 2018.09.21

svr/svr-iot-job/src/main/java/com/yihu/jw/repository/dao/IotDeviceDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.repository.dao;
package com.yihu.jw.repository.device;
import com.yihu.jw.entity.iot.device.IotDeviceDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

svr/svr-iot-job/src/main/java/com/yihu/jw/repository/dao/IotDeviceQualityInspectionPlanDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.repository.dao;
package com.yihu.jw.repository.device;
import com.yihu.jw.entity.iot.device.IotDeviceQualityInspectionPlanDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

svr/svr-iot-job/src/main/java/com/yihu/jw/repository/dao/IotDeviceSimDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.repository.dao;
package com.yihu.jw.repository.device;
import com.yihu.jw.entity.iot.device.IotDeviceSimDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

svr/svr-iot-job/src/main/java/com/yihu/jw/repository/dao/IotPatientDeviceDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.repository.dao;
package com.yihu.jw.repository.device;
import com.yihu.jw.entity.iot.device.IotPatientDeviceDO;
import org.springframework.data.domain.Pageable;

svr/svr-iot-job/src/main/java/com/yihu/jw/repository/dao/IotSystemDictDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.repository.dao;
package com.yihu.jw.repository.dict;
import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

svr/svr-iot-job/src/main/java/com/yihu/jw/service/device/DeviceQualityPlanService.java

@@ -4,9 +4,8 @@ package com.yihu.jw.service.device;
import com.yihu.jw.entity.iot.device.IotDeviceQualityInspectionPlanDO;
import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import com.yihu.jw.entity.iot.message.IotMessageDO;
import com.yihu.jw.repository.dao.IotSystemDictDao;
import com.yihu.jw.repository.dict.IotSystemDictDao;
import com.yihu.jw.repository.message.IotMessageDao;
import com.yihu.jw.repository.service.IotDeviceQualityInspectionPlanService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-iot-job/src/main/java/com/yihu/jw/repository/service/IotDeviceQualityInspectionPlanService.java

@@ -1,17 +1,7 @@
package com.yihu.jw.repository.service;
import com.alibaba.fastjson.JSONObject;
package com.yihu.jw.service.device;
import com.yihu.jw.entity.iot.device.IotDeviceQualityInspectionPlanDO;
import com.yihu.jw.entity.iot.device.IotOrderPurchaseDO;
import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import com.yihu.jw.repository.dao.IotDeviceDao;
import com.yihu.jw.repository.dao.IotDeviceQualityInspectionPlanDao;
import com.yihu.jw.repository.dao.IotSystemDictDao;
import com.yihu.jw.restmodel.iot.device.IotDeviceQualityInspectionPlanVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.iot.IotRequestMapping;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.repository.device.IotDeviceQualityInspectionPlanDao;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +12,6 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
 * @author yeshijie on 2017/12/8.
@@ -44,7 +33,7 @@ public class IotDeviceQualityInspectionPlanService extends BaseJpaService<IotDev
     */
    public List<IotDeviceQualityInspectionPlanDO>  findListAll(String time){
        StringBuffer sql = new StringBuffer("SELECT c.* FROM  iot_device_quality_inspection_plan c WHERE del=1");
        StringBuffer sql = new StringBuffer("SELECT c.* FROM  iot_device_quality_inspection_plan c WHERE del=1 and c.status=1 ");
        List<Object> args = new ArrayList<>();
        if (StringUtils.isNotBlank(time)){

svr/svr-iot-job/src/main/java/com/yihu/jw/repository/service/IotDeviceSimService.java

@@ -1,14 +1,14 @@
package com.yihu.jw.repository.service;
package com.yihu.jw.service.device;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.iot.device.IotDeviceDO;
import com.yihu.jw.entity.iot.device.IotDeviceSimDO;
import com.yihu.jw.entity.iot.device.IotPatientDeviceDO;
import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import com.yihu.jw.repository.dao.IotDeviceDao;
import com.yihu.jw.repository.dao.IotDeviceSimDao;
import com.yihu.jw.repository.dao.IotPatientDeviceDao;
import com.yihu.jw.repository.dao.IotSystemDictDao;
import com.yihu.jw.repository.device.IotDeviceDao;
import com.yihu.jw.repository.device.IotDeviceSimDao;
import com.yihu.jw.repository.device.IotPatientDeviceDao;
import com.yihu.jw.repository.dict.IotSystemDictDao;
import com.yihu.jw.restmodel.iot.device.IotOrderVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.iot.IotRequestMapping;

svr/svr-iot-job/src/main/java/com/yihu/jw/service/device/SimBalanceService.java

@@ -4,10 +4,9 @@ package com.yihu.jw.service.device;
import com.yihu.jw.entity.iot.device.IotDeviceSimDO;
import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import com.yihu.jw.entity.iot.message.IotMessageDO;
import com.yihu.jw.repository.dao.IotDeviceSimDao;
import com.yihu.jw.repository.dao.IotSystemDictDao;
import com.yihu.jw.repository.device.IotDeviceSimDao;
import com.yihu.jw.repository.dict.IotSystemDictDao;
import com.yihu.jw.repository.message.IotMessageDao;
import com.yihu.jw.repository.service.IotDeviceSimService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-iot-job/src/main/java/com/yihu/jw/service/device/SimSetMealService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.service.device;
import com.yihu.jw.entity.iot.device.IotDeviceSimDO;
import com.yihu.jw.repository.dao.IotDeviceSimDao;
import com.yihu.jw.repository.device.IotDeviceSimDao;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-iot-job/src/main/java/com/yihu/jw/repository/service/IotSystemDictService.java

@@ -1,12 +1,10 @@
package com.yihu.jw.repository.service;
package com.yihu.jw.service.dict;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import com.yihu.jw.repository.dao.IotSystemDictDao;
import com.yihu.jw.repository.dict.IotSystemDictDao;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ResultSetExtractor;
import org.springframework.stereotype.Service;

svr/svr-iot-job/src/main/java/com/yihu/jw/web/quota/JobController.java

@@ -76,7 +76,7 @@ public class JobController extends BaseController {
    @RequestMapping(value = "unSettledHISPrescription", method = RequestMethod.GET)
    public String unSettledHISPrescription() {
        try {
            simSetMealService.autoPush();
            deviceQualityPlanService.autoPush();
            return success("成功！");
        } catch (Exception e) {
            error(e);

svr/svr-iot/src/main/java/com/yihu/iot/config/jpa/IotJpa.java

@@ -26,7 +26,7 @@
//@EnableJpaRepositories(
//        entityManagerFactoryRef = "iotEntityManagerFactory",
//        transactionManagerRef = "iotTransactionManager",
//        basePackages = {"com.yihu.iot.dao","com.yihu.iot.datainput.dao"})   //设置Repository所在位置
//        basePackages = {"com.yihu.iot.dict","com.yihu.iot.datainput.dict"})   //设置Repository所在位置
//public class IotJpa {
//
//    @Autowired

svr/svr-iot/src/main/java/com/yihu/iot/controller/common/IotSystemDictController.java

@@ -3,6 +3,7 @@ package com.yihu.iot.controller.common;
import com.alibaba.fastjson.JSONObject;
import com.yihu.iot.service.dict.IotSystemDictService;
import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import com.yihu.jw.restmodel.iot.dict.IotSystemDictVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.iot.IotRequestMapping;
@@ -56,4 +57,19 @@ public class IotSystemDictController extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = IotRequestMapping.System.findByDictName)
    @ApiOperation(value = "根据字典名称获取字典信息",notes = "根据字典名称获取字典信息")
    public MixEnvelop<IotSystemDictVO,IotSystemDictVO> findDict(@ApiParam(name = "dictName", value = "字典名称")
                                                                 @RequestParam(value = "dictName", required = false) String dictName){
        try {
            List<IotSystemDictVO> systemDictVOS = iotSystemDictService.findDict(dictName);
            return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find,systemDictVOS);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
        }
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/controller/device/IotDeviceSimController.java

@@ -6,6 +6,7 @@ import com.yihu.jw.entity.iot.device.IotDeviceSimDO;
import com.yihu.jw.entity.iot.platform.IotInterfaceAuditDO;
import com.yihu.jw.restmodel.iot.company.IotCompanyVO;
import com.yihu.jw.restmodel.iot.device.IotOrderVO;
import com.yihu.jw.restmodel.iot.dict.IotSystemDictVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.iot.IotRequestMapping;
@@ -139,6 +140,4 @@ public class IotDeviceSimController extends EnvelopRestEndpoint {
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/controller/dict/IotDeviceDictController.java

@@ -2,6 +2,7 @@ package com.yihu.iot.controller.dict;
import com.yihu.iot.service.dict.IotDeviceDictService;
import com.yihu.jw.entity.iot.dict.IotDeviceDictDO;
import com.yihu.jw.restmodel.iot.dict.IotSystemDictVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.iot.IotRequestMapping;
@@ -54,4 +55,6 @@ public class IotDeviceDictController extends EnvelopRestEndpoint {
            return MixEnvelop.getError(e.getMessage());
        }
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/service/company/IotCompanyService.java

@@ -494,7 +494,7 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
                list.add(vo);
            });
        }
        company.setAppList(appList);
        company.setAppList(list);
    }
    /**
@@ -795,10 +795,18 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
    public MixEnvelop<IotCompanyVO, IotCompanyVO> findCompanyByAccount() {
        IotCompanyDO companyDO = iotCompanyDao.findByEhrUserId(userAgent.getUID());
        if (companyDO.getAccountType().equalsIgnoreCase("0")){
            List<IotCompanyAppDO> appDOList = iotCompanyAppDao.findByCompanyId(companyDO.getId());
            companyDO.setAppList(appDOList);
        }
        if (companyDO.getAccountType().equalsIgnoreCase("1")){
            findType(companyDO);
        }
        IotCompanyVO companyVO = convertToModelVO(companyDO);
        if (companyDO==null){
            return MixEnvelop.getSuccess("未入驻企业",-1);
        }
        return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find,companyDO.getStatus());
        return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find,companyVO);
    }

svr/svr-iot/src/main/java/com/yihu/iot/service/device/IotDeviceQualityInspectionPlanService.java

@@ -304,7 +304,12 @@ public class IotDeviceQualityInspectionPlanService extends BaseJpaService<IotDev
     */
    public MixEnvelop<IotDeviceQualityInspectionPlanVO, IotDeviceQualityInspectionPlanVO>  findPlanTimeByOrderNo(String orderNo,Integer page,Integer size) {
        List<IotDeviceQualityInspectionPlanDO> listOrderNo = iotDeviceQualityInspectionPlanDao.findByOrderNo(orderNo);
//        List<IotDeviceQualityInspectionPlanDO> listOrderNo = iotDeviceQualityInspectionPlanDao.findByOrderNo(orderNo);
        StringBuffer sql = new StringBuffer("SELECT c.* FROM  iot_device_quality_inspection_plan c WHERE del=1");
        sql.append(" and c.order_no = ").append(orderNo);
        sql.append(sql).append("  ORDER BY c.plan_time DESC LIMIT ").append((page-1)*size).append(",").append(size);
        List<IotDeviceQualityInspectionPlanDO> listOrderNo = jdbcTempalte.query(sql.toString(),new BeanPropertyRowMapper(IotDeviceQualityInspectionPlanDO.class));
        List<IotDeviceQualityInspectionPlanVO> list = transforList(listOrderNo);
        long count = list.size();
        return MixEnvelop.getSuccessListWithPage(IotRequestMapping.Common.message_success_find_functions,list,page,size,count);

svr/svr-iot/src/main/java/com/yihu/iot/service/device/IotDeviceSimService.java

@@ -14,6 +14,7 @@ import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import com.yihu.jw.entity.iot.platform.IotInterfaceAuditDO;
import com.yihu.jw.restmodel.iot.company.IotCompanyVO;
import com.yihu.jw.restmodel.iot.device.IotOrderVO;
import com.yihu.jw.restmodel.iot.dict.IotSystemDictVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.iot.IotRequestMapping;
import com.yihu.jw.util.http.HttpClientUtil;
@@ -215,4 +216,5 @@ public class IotDeviceSimService  extends BaseJpaService<IotDeviceSimDO, IotDevi
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/service/dict/IotSystemDictService.java

@@ -4,17 +4,18 @@ import com.alibaba.fastjson.JSONObject;
import com.yihu.iot.dao.dict.IotSystemDictDao;
import com.yihu.iot.service.common.MyJdbcTemplate;
import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import com.yihu.jw.restmodel.iot.dict.IotSystemDictVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.iot.IotRequestMapping;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
 * @author yeshijie on 2018/1/16.
@@ -108,4 +109,15 @@ public class IotSystemDictService extends BaseJpaService<IotSystemDictDO,IotSyst
        List<JSONObject> list = myJdbcTemplate.queryJson(sql,new Object[]{});
        return list;
    }
    /**
     * 获取字典信息
     * @param dictName
     * @return
     */
    public  List<IotSystemDictVO> findDict(String dictName) {
        List<IotSystemDictDO> listDO = iotSystemDictDao.findByDictName(dictName);
        List<IotSystemDictVO> iotSystemDictVOS = convertToModels(listDO, new ArrayList<>(listDO.size()), IotSystemDictVO.class);
        return iotSystemDictVOS;
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/service/message/IotMessageService.java

@@ -48,22 +48,18 @@ public class IotMessageService  extends BaseJpaService<IotMessageDO, IotMessageD
     */
    public MixEnvelop<IotMessageDO, IotMessageDO> findAll(Integer page, Integer size) throws ParseException {
        String sqlunRead="SELECT * FROM iot_message WHERE read_msg=0 ORDER BY create_time DESC;";
        String sqlRead="SELECT * FROM iot_message WHERE read_msg=1 ORDER BY create_time DESC;";
        StringBuffer sql= new StringBuffer("SELECT * FROM iot_message");
        List<IotMessageDO> unlist = jdbcTemplate.query(sqlunRead, new BeanPropertyRowMapper<>(IotMessageDO.class));
        List<IotMessageDO> list = jdbcTemplate.query(sqlRead, new BeanPropertyRowMapper<>(IotMessageDO.class));
        sql.append(sql).append("  ORDER BY read_msg, create_time DESC LIMIT ").append((page-1)*size).append(",").append(size);
        Map<String, List> listMap = new HashMap<>();
        listMap.put("unread",unlist);
        listMap.put("read",list);
        List<IotMessageDO> list = jdbcTemplate.query(sql.toString(), new BeanPropertyRowMapper<>(IotMessageDO.class));
        long size2 = unlist.size();
        long size1 = list.size();
        long count = list.size();
        long count =size1+size2;
        return MixEnvelop.getSuccessMapWithPage(IotRequestMapping.Company.message_success_find_functions,listMap, page, size,count);
        return MixEnvelop.getSuccessListWithPage(IotRequestMapping.Company.message_success_find_functions,list, page, size,count);
    }
    /**

svr/svr-iot/src/main/java/com/yihu/iot/service/platform/IotShareInterfaceService.java

@@ -171,10 +171,10 @@ public class IotShareInterfaceService extends BaseJpaService<IotShareInterfaceDO
        StringBuffer sql = new StringBuffer("select c.* FROM iot_company_app c WHERE c.del=1 ");
        if(StringUtils.isNotBlank(name)){
            sql.append("and c.`name` like '%").append(name).append("%' OR c.company_name  LIKE  '%").append(name).append("%'");
            sql.append("and ( c.`name` like '%").append(name).append("%' OR c.company_name  LIKE  '%").append(name).append("%')");
        }
        sql.append("order by c.update_time desc limit ").append((page-1)*size).append(",").append(size);
        sql.append(" order by c.update_time desc limit ").append((page-1)*size).append(",").append(size);
        List<IotCompanyAppDO> list = jdbcTemplate.query(sql.toString(),new BeanPropertyRowMapper(IotCompanyAppDO.class));

svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/config/jpa/WlyyJpa.java

@@ -26,7 +26,7 @@ import javax.sql.DataSource;
@EnableJpaRepositories(
        entityManagerFactoryRef = "wlyyEntityManagerFactory",
        transactionManagerRef = "wlyyTransactionManager",
        basePackages = {"com.yihu.wlyy.statistics.dao"})   //设置Repository所在位置
        basePackages = {"com.yihu.wlyy.statistics.dict"})   //设置Repository所在位置
public class WlyyJpa {
    @Autowired

svr/svr-wlyy-archives/src/main/java/com/yihu/jw/config/jpa/WlyyArchivesJpa.java

@@ -25,7 +25,7 @@ import java.util.Properties;
@EnableJpaRepositories(
        entityManagerFactoryRef = "wlyyArchivesEntityManagerFactory",
        transactionManagerRef = "wlyyArchivesTransactionManager",
        basePackages = {"com.yihu.jw.dao"})   //设置Repository所在位置
        basePackages = {"com.yihu.jw.dict"})   //设置Repository所在位置
public class WlyyArchivesJpa {
    @Autowired

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/dao/AccountDao.java

@@ -11,7 +11,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * @author wangzhinan
 * @create 2018-05-10 11:15
 * @desc health bank account dao
 * @desc health bank account dict
 **/
public interface AccountDao extends PagingAndSortingRepository<AccountDO,String>,JpaSpecificationExecutor<AccountDO> {
    @Query("select t from AccountDO t where t.patientId=?1 and t.status=1")

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/dao/ActiveRecordDao.java

@@ -9,7 +9,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * @author wangzhinan
 * @create 2018-05-10 11:15
 * @desc health bank account dao
 * @desc health bank account dict
 **/
public interface ActiveRecordDao extends PagingAndSortingRepository<ActiveRecordDO,String>,JpaSpecificationExecutor<ActiveRecordDO> {

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/dao/ExchangeGoodsDao.java

@@ -11,7 +11,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * @author wangzhinan
 * @create 2018-05-03 15:28
 * @desc exchange goods dao
 * @desc exchange goods dict
 **/
public interface ExchangeGoodsDao extends PagingAndSortingRepository<ExchangeGoodsDO,String>,JpaSpecificationExecutor<ExchangeGoodsDO> {
    @Query("select t from ExchangeGoodsDO t where t.activityGoodsId = ?1 and t.patientId = ?2")

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/dao/TaskDao.java

@@ -14,7 +14,7 @@ import java.util.List;
/**
 * @author wangzhinan
 * @create 2018-05-10 11:17
 * @desc health bank task dao
 * @desc health bank task dict
 **/
public interface TaskDao extends PagingAndSortingRepository<TaskDO,String>,JpaSpecificationExecutor<TaskDO> {
    @Query("select t from TaskDO t where t.transactionId = ?1 and t.type='ACTIVITY_TASK'")

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/dao/TaskGoodsDao.java

@@ -14,7 +14,7 @@ import java.util.List;
/**
 * @author wangzhinan
 * @create 2018-06-08 15:28
 * @desc 商品 dao
 * @desc 商品 dict
 **/
public interface TaskGoodsDao extends PagingAndSortingRepository<TaskGoodsDO,String>,JpaSpecificationExecutor<TaskGoodsDO> {

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/dao/TaskRuleDao.java

@@ -11,7 +11,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * @author wangzhinan
 * @create 2018-05-10 11:17
 * @desc health bank task dao
 * @desc health bank task dict
 **/
public interface TaskRuleDao extends PagingAndSortingRepository<TaskRuleDO,String>,JpaSpecificationExecutor<TaskRuleDO> {
    @Query("select t from TaskRuleDO t where t.id = ?1 and t.status=1")

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

@@ -1,4 +1,4 @@
//package com.yihu.jw.dao;
//package com.yihu.jw.dict;
//
//import com.yihu.jw.entity.specialist.PatientLabelDO;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

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

@@ -1,4 +1,4 @@
//package com.yihu.jw.dao;
//package com.yihu.jw.dict;
//
//import com.yihu.jw.entity.specialist.PatientLabelDO;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

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

@@ -1,4 +1,4 @@
//package com.yihu.jw.dao;
//package com.yihu.jw.dict;
//
//import com.yihu.jw.entity.specialist.SpecialistArticleDO;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

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

@@ -1,4 +1,4 @@
//package com.yihu.jw.dao;
//package com.yihu.jw.dict;
//
//import com.yihu.jw.entity.specialist.SpecialistConsultDO;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

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

@@ -1,4 +1,4 @@
//package com.yihu.jw.dao;
//package com.yihu.jw.dict;
//
//import com.yihu.jw.entity.specialist.SpecialistDO;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;