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

app/app-iot-server/pom.xml

@@ -157,6 +157,13 @@
            <artifactId>mime-util</artifactId>
            <version>2.1.3</version>
        </dependency>
        <dependency>
            <groupId>com.h2database</groupId>
            <artifactId>h2</artifactId>
            <scope>runtime</scope>
        </dependency>
    </dependencies>
    <build>

common/common-entity/src/main/java/com/yihu/jw/entity/iot/company/IotCompanyDO.java

@@ -74,7 +74,7 @@ public class IotCompanyDO extends UuidIdentityEntityWithOperator implements Seri
    @Column(name = "audit_name")
    private String auditName;//审核人姓名
    @Transient
//    private List<IotCompanyAppDO> appList;//应用实体
    private List<IotCompanyAppDO> appList;//应用实体
    public String getSaasId() {
        return saasId;
@@ -285,11 +285,12 @@ public class IotCompanyDO extends UuidIdentityEntityWithOperator implements Seri
        this.auditName = auditName;
    }
//    public List<IotCompanyAppDO> getAppList() {
//        return appList;
//    }
//
//    public void setAppList(List<IotCompanyAppDO> appList) {
//        this.appList = appList;
//    }
    @Transient
    public List<IotCompanyAppDO> getAppList() {
        return appList;
    }
    public void setAppList(List<IotCompanyAppDO> appList) {
        this.appList = appList;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/iot/dict/IotHospitalDO.java

@@ -0,0 +1,167 @@
package com.yihu.jw.entity.iot.dict;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * @author humingfen on 2020/4/27.
 */
@Entity
@Table(name = "iot_hospital")
public class IotHospitalDO extends UuidIdentityEntity {
    @Column(name = "saas_id")
    private String saasId;
    // 医院名稱
    private String name;
    // 作废标志，1有效 0 失效
    private String del;
    //省份标志
    private String province;
    //省份名称
    @Column(name = "province_name")
    private String provinceName;
    //城市标志
    private String city;
    //城市名称
    @Column(name = "city_name")
    private String cityName;
    //区县标志
    private String town;
    //区县名称
    @Column(name = "town_name")
    private String townName;
    //级别，1医院，2社区医院
    private int level;
    //医院等级
    private int grade;
    //医院详细地址
    private String address;
    //医院简介
    private String intro;
    //医院图片
    private String photo;
    private String phone;//联系方式
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getDel() {
        return del;
    }
    public void setDel(String del) {
        this.del = del;
    }
    public String getProvince() {
        return province;
    }
    public void setProvince(String province) {
        this.province = province;
    }
    public String getProvinceName() {
        return provinceName;
    }
    public void setProvinceName(String provinceName) {
        this.provinceName = provinceName;
    }
    public String getCity() {
        return city;
    }
    public void setCity(String city) {
        this.city = city;
    }
    public String getCityName() {
        return cityName;
    }
    public void setCityName(String cityName) {
        this.cityName = cityName;
    }
    public String getTown() {
        return town;
    }
    public void setTown(String town) {
        this.town = town;
    }
    public String getTownName() {
        return townName;
    }
    public void setTownName(String townName) {
        this.townName = townName;
    }
    public int getLevel() {
        return level;
    }
    public void setLevel(int level) {
        this.level = level;
    }
    public int getGrade() {
        return grade;
    }
    public void setGrade(int grade) {
        this.grade = grade;
    }
    public String getAddress() {
        return address;
    }
    public void setAddress(String address) {
        this.address = address;
    }
    public String getIntro() {
        return intro;
    }
    public void setIntro(String intro) {
        this.intro = intro;
    }
    public String getPhoto() {
        return photo;
    }
    public void setPhoto(String photo) {
        this.photo = photo;
    }
    public String getPhone() {
        return phone;
    }
    public void setPhone(String phone) {
        this.phone = phone;
    }
}

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

@@ -22,6 +22,7 @@ public class IotRequestMapping {
        public static final String patientDevice = api_iot_common + "/patientDevice";
        public static final String wlyy = api_iot_common + "/wlyy";
        public static final String figereLabel = api_iot_common + "/figereLabel";
        public static final String hospital = api_iot_common + "hospital";
        public static final String message_success_update = "update success";
@@ -284,4 +285,14 @@ public class IotRequestMapping {
    }
    /**
     * 单位模块常量
     */
    public static class Hospital{
        public static final String getListByName = "getListByName";
        public static final String create = "createHospital";
        public static final String message_success_find = "hospital find success";
        public static final String message_success_create = "hospital create success";
    }
}

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

@@ -0,0 +1,55 @@
package com.yihu.iot.controller.dict;
import com.yihu.iot.service.dict.IotHospitalService;
import com.yihu.jw.entity.iot.dict.IotHospitalDO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.iot.IotRequestMapping;
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.List;
@RestController
@RequestMapping(IotRequestMapping.Common.hospital)
@Api(tags = "单位管理相关操作", description = "单位管理相关操作")
public class HospitalController extends EnvelopRestEndpoint {
    @Autowired
    private IotHospitalService hospitalService;
    @PostMapping(value = IotRequestMapping.Hospital.create)
    @ApiOperation(value = "创建编辑单位字典")
    public MixEnvelop create(
            @ApiParam(name = "jsonData", value = "设备体征字典json数据")
            @RequestParam(value = "jsonData", required = false) String jsonData){
        try {
            IotHospitalDO hospitalDO = toEntity(jsonData, IotHospitalDO.class);
            return MixEnvelop.getSuccess(IotRequestMapping.Company.message_success_create, hospitalService.create(hospitalDO));
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
        }
    }
    @GetMapping(value = IotRequestMapping.Hospital.getListByName)
    @ApiOperation(value = "获取机构单位列表接口")
    public MixEnvelop getListByName(
            @ApiParam(name = "name", value = "机构名称")
            @RequestParam(value = "name", required = false) String name,
            @ApiParam(name = "page", value = "当前页，从1开始")
            @RequestParam(value = "page", required = false) Integer page,
            @ApiParam(name = "pageSize", value = "页面大小")
            @RequestParam(value = "pageSize", required = false) Integer pageSize){
        try {
            List<IotHospitalDO> hospitalDOList = hospitalService.getListByName(name, page, pageSize);
            return MixEnvelop.getSuccessList(IotRequestMapping.Company.message_success_create, hospitalDOList);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
        }
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/dao/dict/IotHospitalDao.java

@@ -0,0 +1,9 @@
package com.yihu.iot.dao.dict;
import com.yihu.jw.entity.iot.dict.IotHospitalDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface IotHospitalDao extends PagingAndSortingRepository<IotHospitalDO, String>,
        JpaSpecificationExecutor<IotHospitalDO> {
}

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

@@ -198,9 +198,17 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
        sql.append("order by c.update_time desc limit ").append((page-1)*size).append(",").append(size);
        List<IotCompanyDO> list = jdbcTempalte.query(sql.toString(),args.toArray(),new BeanPropertyRowMapper(IotCompanyDO.class));
        list.forEach(one->{
            findType(one);
        });
        if(accountType.equalsIgnoreCase("1")){
            //得到list数据
            list.forEach(one->{
                findType(one);
            });
        }
        if(accountType.equalsIgnoreCase("0")){
            list.forEach(one->{
                findAppType(one);
            });
        }
        List<Map<String,Object>> countList = jdbcTempalte.queryForList(sqlCount.toString());
        long count = Long.valueOf(countList.get(0).get("count").toString());

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

@@ -0,0 +1,39 @@
package com.yihu.iot.service.dict;
import com.yihu.iot.dao.dict.IotHospitalDao;
import com.yihu.jw.entity.iot.dict.IotHospitalDO;
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.List;
/**
 * @author humingfen on 2020/4/27.
 */
@Service
public class IotHospitalService {
    @Autowired
    private IotHospitalDao hospitalDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    public IotHospitalDO create(IotHospitalDO hospitalDO) {
        hospitalDO.setDel("1");
        hospitalDao.save(hospitalDO);
        return hospitalDO;
    }
    public List<IotHospitalDO> getListByName(String name, Integer page, Integer pageSize) {
        String sql = "SELECT * FROM `iot_hospital` h WHERE h.del = 1 ";
        if(StringUtils.isNotBlank(name)){
            sql += "and h.name like '%" + name + "%' ";
        }
        if(page != null && pageSize != null){
            sql += "limit " + (page-1)*pageSize + "," + pageSize;
        }
        List<IotHospitalDO> list = jdbcTemplate.queryForList(sql, IotHospitalDO.class);
        return list;
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/service/product/IotProductBaseInfoService.java

@@ -8,6 +8,7 @@ import com.yihu.jw.restmodel.iot.product.*;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang.StringUtils;
import org.omg.CORBA.BAD_CONTEXT;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -146,9 +147,37 @@ public class IotProductBaseInfoService extends BaseJpaService<IotProductBaseInfo
        //基础信息
        String productId = baseInfoDO.getId();
        IotProductBaseInfoDO baseInfoDOOld = iotProductBaseInfoDao.findById(productId);
        baseInfoDO.setDel(1);
        baseInfoDO.setSaasId(baseInfoDOOld.getSaasId());
        iotProductBaseInfoDao.save(baseInfoDO);
        baseInfoDOOld.setParentId(baseInfoDO.getParentId());
        baseInfoDOOld.setProductClassify(baseInfoDO.getProductClassify());
        baseInfoDOOld.setSupplierName(baseInfoDO.getSupplierName());
        baseInfoDOOld.setSupplierId(baseInfoDO.getSupplierId());
        baseInfoDOOld.setCompanyName(baseInfoDO.getCompanyName());
        baseInfoDOOld.setCompanyId(baseInfoDO.getCompanyId());
        baseInfoDOOld.setProductSubclass(baseInfoDO.getProductSubclass());
        baseInfoDOOld.setInstrumentClassify(baseInfoDO.getInstrumentClassify());
        baseInfoDOOld.setRegisterCertificate(baseInfoDO.getRegisterCertificate());
        baseInfoDOOld.setRegisterCertificateImg(baseInfoDO.getRegisterCertificateImg());
        baseInfoDOOld.setStartTime(baseInfoDO.getStartTime());
        baseInfoDOOld.setEndTime(baseInfoDO.getEndTime());
        baseInfoDOOld.setName(baseInfoDO.getName());
        baseInfoDOOld.setAlias(baseInfoDO.getAlias());
        baseInfoDOOld.setBrandName(baseInfoDO.getBrandName());
        baseInfoDOOld.setOriginPlace(baseInfoDO.getOriginPlace());
        baseInfoDOOld.setOriginType(baseInfoDO.getOriginType());
        baseInfoDOOld.setIsColdChain(baseInfoDO.getIsColdChain());
        baseInfoDOOld.setCertificateId(baseInfoDO.getCertificateId());
        baseInfoDOOld.setCertificateName(baseInfoDO.getCertificateName());
        baseInfoDOOld.setType(baseInfoDO.getType());
        baseInfoDOOld.setDel(0);
        baseInfoDOOld.setRegisterName(baseInfoDO.getRegisterName());
        baseInfoDOOld.setSpec(baseInfoDO.getSpec());
        baseInfoDOOld.setUnit(baseInfoDO.getUnit());
        baseInfoDOOld.setPurchasePrice(baseInfoDO.getPurchasePrice());
        baseInfoDOOld.setRetailPrice(baseInfoDO.getRetailPrice());
        baseInfoDOOld.setCategoryCode(baseInfoDO.getCategoryCode());
        baseInfoDOOld.setSaasId(getCode());
        baseInfoDOOld.setId(baseInfoDO.getId());
        iotProductBaseInfoDao.save(baseInfoDOOld);
        //扩展信息
        IotProductExtendInfoDO extendInfoDOOld = iotProductExtendInfoDao.findByProductId(productId);
        extendInfoDOOld.setContraindication(extendInfoDO.getContraindication());
@@ -158,6 +187,9 @@ public class IotProductBaseInfoService extends BaseJpaService<IotProductBaseInfo
        extendInfoDOOld.setStandard(extendInfoDO.getStandard());
        extendInfoDOOld.setUseRange(extendInfoDO.getUseRange());
        extendInfoDOOld.setVersion(extendInfoDO.getVersion());
        extendInfoDOOld.setAgencyName(extendInfoDO.getAgencyName());
        extendInfoDOOld.setCompanyName(extendInfoDO.getCompanyName());
        extendInfoDOOld.setRatifyDate(extendInfoDO.getRatifyDate());
        iotProductExtendInfoDao.save(extendInfoDOOld);
        //附件
        List<IotProductAttachmentDO> attachmentDOOldList = iotProductAttachmentDao.findByProductId(productId);

svr/svr-iot/src/main/resources/application.yml

@@ -100,16 +100,16 @@ fastDFS:
spring:
  profiles: jwtest
  datasource:
    url: jdbc:mysql://172.19.103.77:3306/xmiot?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
    url: jdbc:mysql://172.26.0.104/xmiot?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: ssgg
    password: ssgg@jkzl2019
  elasticsearch:
    cluster-name: jkzl #默认即为elasticsearch  集群名
    cluster-nodes: 172.19.103.45:9300,172.19.103.68:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
    jest:
      uris: http://172.19.103.45:9200,http://172.19.103.68:9200
  wlyy:
    url: http://www.xmtyw.cn/wlyy/
    url: http://ehr.yihu.com/wlyy/
fast-dfs:
  tracker-server: 172.19.103.54:22122 #服务器地址
fastDFS: