Merge branch 'dev' of chaoren1/wlyy2.0 into medicare

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinedevice.java

@@ -4,9 +4,7 @@ package com.yihu.jw.entity.a1entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinedrugs.java

@@ -4,9 +4,7 @@ package com.yihu.jw.entity.a1entity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicineorder.java

@@ -5,9 +5,7 @@ package com.yihu.jw.entity.a1entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicineorderdetail.java

@@ -2,9 +2,7 @@ package com.yihu.jw.entity.a1entity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@@ -37,7 +35,7 @@ public class Mediicineorderdetail extends UuidIdentityEntityWithOperator impleme
    /**
     * 数量
     */
    private float quantity;
    private String quantity;
    /**
     * 批次号
@@ -230,11 +228,11 @@ public class Mediicineorderdetail extends UuidIdentityEntityWithOperator impleme
        this.price = price;
    }
    public float getQuantity() {
    public String getQuantity() {
        return quantity;
    }
    public void setQuantity(float quantity) {
    public void setQuantity(String quantity) {
        this.quantity = quantity;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinestockout.java

@@ -3,9 +3,7 @@ package com.yihu.jw.entity.a1entity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinestockoutdetail.java

@@ -2,9 +2,9 @@ package com.yihu.jw.entity.a1entity;
import javax.persistence.Column;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@@ -12,104 +12,79 @@ import java.util.Date;
@Entity
@Table(name="t_mediicine_stockout_detail")
public class Mediicinestockoutdetail implements Serializable {
public class Mediicinestockoutdetail extends UuidIdentityEntityWithOperator implements Serializable {
    private static final long serialVersionUID = 1L;
    @Id
    /**
     * idstockoutdetail
     */
    @Column(length = 40)
    private String idStockOutDetail;
  
    /**
     * idstockout
     */
    @Column(length = 40)
    private String idStockOut;
    /**
     * orderno
     */
    @Column(length = 40)
    private String orderNo;
    /**
     * 药品信息
     */
    @Column(length = 40)
    private String medInfo;
    /**
     * 售价
     */
    @Column(length = 40)
    private float price;
    /**
     * 数量
     */
    @Column(length = 40)
    private String quantity;
    /**
     * 批次号
     */
    @Column(length = 40)
    private Integer batchNum;
    private String batchNum;
    /**
     * cargoinfo
     */
    @Column(length = 40)
    private String cargoInfo;
    /**
     * drugcode
     */
    @Column(length = 40)
    private String drugCode;
    /**
     * 生产日期
     */
    @Column(length = 40)
    private Date proDate;
    /**
     * 有效期至
     */
    @Column(length = 40)
    private Date expDate;
    /**
     * 商品图
     */
    @Column(length = 40)
    private String productPic;
    /**
     * 订单号
     */
    @Column(length = 40)
    private String idOrder;
    /**
     * 订单明细
     */
    @Column(length = 40)
    private String IdOrderDetail;
    public Mediicinestockoutdetail() {
    }
    public String getIdStockOutDetail() {
        return idStockOutDetail;
    }
    public void setIdStockOutDetail(String idStockOutDetail) {
        this.idStockOutDetail = idStockOutDetail;
    }
    public String getIdStockOut() {
        return idStockOut;
@@ -151,11 +126,11 @@ public class Mediicinestockoutdetail implements Serializable {
        this.quantity = quantity;
    }
    public Integer getBatchNum() {
    public String getBatchNum() {
        return batchNum;
    }
    public void setBatchNum(Integer batchNum) {
    public void setBatchNum(String batchNum) {
        this.batchNum = batchNum;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinestockup.java

@@ -1,90 +1,75 @@
package com.yihu.jw.entity.a1entity;
import javax.persistence.Column;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@Entity
@Table(name="t_mediicine_stockup")
public class Mediicinestockup implements Serializable {
public class Mediicinestockup extends UuidIdentityEntityWithOperator implements Serializable {
    private static final long serialVersionUID = 1L;
    @Id
    /**
     * idstockup
     */
    @Column(length = 40)
    private String idStockUp;
    /**
     * community
     */
    @Column(length = 40)
    private String community;
    /**
     * replenisher
     */
    @Column(length = 40)
    private String replenishEr;
    /**
     * state
     */
    @Column(length = 40)
    private String state;
    /**
     * replenishequ
     */
    @Column(length = 40)
    private String replenishEqu;
    /**
     * replenishcate
     */
    @Column(length = 40)
    private String replenishCate;
    /**
     * replenishinventory
     */
    @Column(length = 40)
    private String replenishInventory;
    /**
     * 单据号（备货单号）
     */
    private String docNum;
    /**
     * doctime
     */
    @Column(length = 40)
    private Date docTime;
    /**
     * remark
     */
    @Column(length = 40)
    private String remark;
    /**
     * 单号
     */
    @Column(length = 40)
    private Integer trackNum;
    public Mediicinestockup() {
    }
    public String getIdStockUp() {
        return idStockUp;
    }
    public void setIdStockUp(String idStockUp) {
        this.idStockUp = idStockUp;
    }
    public String getCommunity() {
        return community;
@@ -134,6 +119,14 @@ public class Mediicinestockup implements Serializable {
        this.replenishInventory = replenishInventory;
    }
    public String getDocNum() {
        return docNum;
    }
    public void setDocNum(String docNum) {
        this.docNum = docNum;
    }
    public Date getDocTime() {
        return docTime;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinestockupdetail.java

@@ -1,77 +1,60 @@
package com.yihu.jw.entity.a1entity;
import javax.persistence.Column;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@Entity
@Table(name="t_mediicine_stockup_detail")
public class Mediicinestockupdetail implements Serializable {
    private static final long serialVersionUID = 1L;
    @Id
    /**
     * idstockupdetail
     */
    @Column(length = 40)
    private String idStockUpDetail;
public class Mediicinestockupdetail extends UuidIdentityEntityWithOperator implements Serializable {
    
    /**
     * idstockup
     */
    @Column(length = 40)
    private String idStockUp;
    /**
     * orderno
     */
    @Column(length = 40)
    private String orderNo;
    /**
     * 药品信息
     */
    @Column(length = 40)
    private String medInfo;
    /**
     * 售价
     */
    @Column(length = 40)
    private double price;
    /**
     * 数量
     */
    @Column(length = 40)
    private String quantity;
    /**
     * 批次号
     */
    @Column(length = 40)
    private Integer batchNum;
    private String batchNum;
    /**
     * cargoinfo
     */
    @Column(length = 40)
    private String cargoInfo;
    /**
     * drugcode
     */
    @Column(length = 40)
    private String drugCode;
    /**
     * 生产日期
     */
    @Column(length = 40)
    private Date proDate;
    /**
@@ -82,19 +65,12 @@ public class Mediicinestockupdetail implements Serializable {
    /**
     * 商品图
     */
    @Column(length = 40)
    private String productPic;
    public Mediicinestockupdetail() {
    }
    public String getIdStockUpDetail() {
        return idStockUpDetail;
    }
    public void setIdStockUpDetail(String idStockUpDetail) {
        this.idStockUpDetail = idStockUpDetail;
    }
    public String getIdStockUp() {
        return idStockUp;
@@ -136,11 +112,11 @@ public class Mediicinestockupdetail implements Serializable {
        this.quantity = quantity;
    }
    public Integer getBatchNum() {
    public String getBatchNum() {
        return batchNum;
    }
    public void setBatchNum(Integer batchNum) {
    public void setBatchNum(String batchNum) {
        this.batchNum = batchNum;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinestore.java

@@ -1,66 +1,48 @@
package com.yihu.jw.entity.a1entity;
import javax.persistence.Column;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@Entity
@Table(name="t_mediicine_store")
public class Mediicinestore implements Serializable {
public class Mediicinestore extends UuidIdentityEntityWithOperator implements Serializable {
    private static final long serialVersionUID = 1L;
    @Id
    /**
     * idstore
     */
    @Column(length = 40)
    private String idStore;
  
    /**
     * 设备id
     */
    @Column(length = 40)
    private String idDevice;
    /**
     * sku
     */
    @Column(length = 40)
    private String sku;
    /**
     * state
     */
    @Column(length = 40)
    private String state;
    /**
     * num
     */
    @Column(length = 40)
    private Integer num;
    private String num;
    /**
     * num
     */
    @Column(length = 40)
    private Date longtime;
    public Mediicinestore() {
    }
    public String getIdStore() {
        return idStore;
    }
    public void setIdStore(String idStore) {
        this.idStore = idStore;
    }
    
    public String getIdDevice() {
        return idDevice;
@@ -86,11 +68,11 @@ public class Mediicinestore implements Serializable {
        this.state = state;
    }
    public Integer getNum() {
    public String getNum() {
        return num;
    }
    public void setNum(Integer num) {
    public void setNum(String num) {
        this.num = num;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicineuser.java

@@ -2,84 +2,68 @@ package com.yihu.jw.entity.a1entity;
import javax.persistence.Column;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@Entity
@Table(name="t_mediicine_user")
public class Mediicineuser implements Serializable {
public class Mediicineuser extends UuidIdentityEntityWithOperator implements Serializable {
    private static final long serialVersionUID = 1L;
    @Id
    /**
     * iduser
     */
    @Column(length = 40)
    private String idUser;
    /**
     * 姓名
     */
    @Column(length = 40)
    private String name;
    /**
     * 性别
     */
    @Column(length = 40)
    private String sex;
    /**
     * 出生日期
     */
    @Column(length = 40)
    private Date birDate;
    /**
     * 所属区域
     */
    @Column(length = 40)
    private String belongCommunity;
    /**
     * 角色
     */
    @Column(length = 40)
    private String role;
    /**
     * contactinfo
     */
    @Column(length = 40)
    private String contactInfo;
    /**
     * account
     */
    @Column(length = 40)
    private String account;
    /**
     * password
     */
    @Column(length = 40)
    private String password;
    /**
     * confirmpassword
     */
    @Column(length = 40)
    private String confirmPassword;
    /**
     * 负责药柜
     */
    @Column(length = 40)
    private String resMedCabinet;
    /**
@@ -90,14 +74,6 @@ public class Mediicineuser implements Serializable {
    public Mediicineuser() {
    }
    public String getIdUser() {
        return idUser;
    }
    public void setIdUser(String idUser) {
        this.idUser = idUser;
    }
    public String getName() {
        return name;

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinewarray.java

@@ -1,99 +1,81 @@
package com.yihu.jw.entity.a1entity;
import javax.persistence.Column;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@Entity
@Table(name="t_mediicine_warray")
public class Mediicinewarray implements Serializable {
public class Mediicinewarray extends UuidIdentityEntityWithOperator implements Serializable {
    private static final long serialVersionUID = 1L;
    @Id
    /**
     * idwarray
     */
    @Column(length = 40)
    private String idWarray;
    /**
     * 类型
     */
    @Column(length = 40)
    private String type;
    /**
     * 开方时间
     * 记录时间
     */
    @Column(length = 40)
    private Date logTime;
    @Column(length = 50)
    private String idDevice;
    /**
     * 设备分类
     */
    @Column(length = 50)
    private String equClass;
    /**
     * 所属
     */
    @Column(length = 50)
    private String belongCommunity;
    /**
     * 网络状态
     */
    private Integer networkStatus;
    private String networkStatus;
    /**
     * 售卖状态
     */
    private Integer saleStatus;
    private String saleStatus;
    /**
     * 设备名称
     */
    @Column(length = 50)
    private String equName;
    /**
     * 设备编号
     */
    @Column(length = 50)
    private String equNum;
    /**
     * 机器编码
     */
    @Column(length = 50)
    private String machineCode;
    /**
     * 设备型号
     */
    @Column(length = 50)
    private String equType;
    /**
     * 上电测试
     */
    @Column(length = 50)
    private String poweronTest;
    /**
     * 设备详情
     */
    @Column(length = 100)
    private String equInfo;
    /**
@@ -104,7 +86,7 @@ public class Mediicinewarray implements Serializable {
    /**
     * 信号强度
     */
    private Integer signalIntensity;
    private String signalIntensity;
    /**
     * 温度信息
     */
@@ -121,43 +103,38 @@ public class Mediicinewarray implements Serializable {
    /**
     * 社区中心名称
     */
    @Column(length = 100)
    private String community;
    /**
     * 投放地址
     */
    @Column(length = 200)
    private String deliveryAddress;
    /**
     * 升级情况
     */
    @Column(length = 40)
    private String upgrAdesit;
    /**
     * 设备区域
     */
    @Column(length = 40)
    private String equArea;
    /**
     * 详细地址
     */
    @Column(length = 140)
    private String detailAddress;
    /**
     * 删除
     */
    private Integer del;
    private String del;
    /**
     * 状态
     */
    private Integer status;
    private String status;
    /**
@@ -172,27 +149,20 @@ public class Mediicinewarray implements Serializable {
    /**
     * 出货异常次数
     */
    private Integer shipCouont;
    private String shipCouont;
    /**
     * 插口异常次数
     */
    private Integer plusCouont;
    private String plusCouont;
    /**
     * 其他异常次数
     */
    private Integer otherCouont;
    private String otherCouont;
    public Mediicinewarray() {
    }
    public String getIdWarray() {
        return idWarray;
    }
    public void setIdWarray(String idWarray) {
        this.idWarray = idWarray;
    }
    
    public String getType() {
        return type;
@@ -234,19 +204,19 @@ public class Mediicinewarray implements Serializable {
        this.belongCommunity = belongCommunity;
    }
    public Integer getNetworkStatus() {
    public String getNetworkStatus() {
        return networkStatus;
    }
    public void setNetworkStatus(Integer networkStatus) {
    public void setNetworkStatus(String networkStatus) {
        this.networkStatus = networkStatus;
    }
    public Integer getSaleStatus() {
    public String getSaleStatus() {
        return saleStatus;
    }
    public void setSaleStatus(Integer saleStatus) {
    public void setSaleStatus(String saleStatus) {
        this.saleStatus = saleStatus;
    }
@@ -306,11 +276,11 @@ public class Mediicinewarray implements Serializable {
        this.regDate = regDate;
    }
    public Integer getSignalIntensity() {
    public String getSignalIntensity() {
        return signalIntensity;
    }
    public void setSignalIntensity(Integer signalIntensity) {
    public void setSignalIntensity(String signalIntensity) {
        this.signalIntensity = signalIntensity;
    }
@@ -378,19 +348,19 @@ public class Mediicinewarray implements Serializable {
        this.detailAddress = detailAddress;
    }
    public Integer getDel() {
    public String getDel() {
        return del;
    }
    public void setDel(Integer del) {
    public void setDel(String del) {
        this.del = del;
    }
    public Integer getStatus() {
    public String getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
    public void setStatus(String status) {
        this.status = status;
    }
@@ -410,27 +380,27 @@ public class Mediicinewarray implements Serializable {
        this.duration = duration;
    }
    public Integer getShipCouont() {
    public String getShipCouont() {
        return shipCouont;
    }
    public void setShipCouont(Integer shipCouont) {
    public void setShipCouont(String shipCouont) {
        this.shipCouont = shipCouont;
    }
    public Integer getPlusCouont() {
    public String getPlusCouont() {
        return plusCouont;
    }
    public void setPlusCouont(Integer plusCouont) {
    public void setPlusCouont(String plusCouont) {
        this.plusCouont = plusCouont;
    }
    public Integer getOtherCouont() {
    public String getOtherCouont() {
        return otherCouont;
    }
    public void setOtherCouont(Integer otherCouont) {
    public void setOtherCouont(String otherCouont) {
        this.otherCouont = otherCouont;
    }
}

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

@@ -9,6 +9,144 @@ public class BaseRequestMapping {
    @Deprecated
    public static final String api_base_common = "/svr-bases";
    /**
     * 报警表  BaseSensitive
     */
    public static class BaseWarray extends Basic {
        public static final String PREFIX  = "/baseWarray";
        public static final String DOCINFO  = "/docInfo";
        public static final String CREATE  = "/create";
        public static final String getTemperature  = "/getTemperature";
        public static final String getOffline  = "/getOffline";
        public static final String getFault  = "/getFault";
        public static final String getFlow  = "/getFlow";
        public static final String getHumidity  = "/getHumidity";
        public static final String getNetwork  = "/getNetwork";
        public static final String getExceed  = "/getExceed";
        public static final String getUpDetailListById  = "/getUpDetailListById";
        public static final String getOrgListByTown  = "/getOrgListByTown";
        public static final String enableOrDis  = "/enableOrDis";
        public static final String docFullInfo  = "/docFullInfo";
        public static final String docOrgDutyTreeInfo  = "/docOrgDutyTreeInfo";
        public static final String docOrgDeptTreeInfo  = "/docOrgDeptTreeInfo";
        public static final String getDoctorListByDept  = "/getDoctorListByDept";
        public static final String DOCTOR_INFO_IMPORT  = "/baseDoctorInfoImport";
        public static final String findIncentive  = "/findIncentive";
        public static final String findIncentiveById  = "/findIncentiveById";
        public static final String deleteIncentiveById  = "/deleteIncentiveById";
        public static final String saveIncentiveById  = "/saveIncentiveById";
        public static final String saveDoctorIncentive  = "/saveDoctorIncentive";
        public static final String findDoctorIncentive  = "/findDoctorIncentive";
        public static final String findDoctorOtherIncentive  = "/findDoctorOtherIncentive";
        public static final String removeIncentive  = "/removeIncentive";
        public static final String resetDoctorPwd  = "/resetDoctorPwd";
    }
    /**
     * 备货单  BaseSensitive
     */
    public static class BaseUp extends Basic {
        public static final String PREFIX  = "/baseUp";
        public static final String DOCINFO  = "/docInfo";
        public static final String CREATE  = "/create";
        public static final String getUpDetailListById  = "/getUpDetailListById";
        public static final String getOrgListByTown  = "/getOrgListByTown";
        public static final String enableOrDis  = "/enableOrDis";
        public static final String docFullInfo  = "/docFullInfo";
        public static final String docOrgDutyTreeInfo  = "/docOrgDutyTreeInfo";
        public static final String docOrgDeptTreeInfo  = "/docOrgDeptTreeInfo";
        public static final String getDoctorListByDept  = "/getDoctorListByDept";
        public static final String DOCTOR_INFO_IMPORT  = "/baseDoctorInfoImport";
        public static final String findIncentive  = "/findIncentive";
        public static final String findIncentiveById  = "/findIncentiveById";
        public static final String deleteIncentiveById  = "/deleteIncentiveById";
        public static final String saveIncentiveById  = "/saveIncentiveById";
        public static final String saveDoctorIncentive  = "/saveDoctorIncentive";
        public static final String findDoctorIncentive  = "/findDoctorIncentive";
        public static final String findDoctorOtherIncentive  = "/findDoctorOtherIncentive";
        public static final String removeIncentive  = "/removeIncentive";
        public static final String resetDoctorPwd  = "/resetDoctorPwd";
    }
    /**
     * 出货单  BaseSensitive
     */
    public static class BaseOut extends Basic {
        public static final String PREFIX  = "/baseOut";
        public static final String DOCINFO  = "/docInfo";
        public static final String CREATE  = "/create";
        public static final String getOutDetailListById  = "/getOutDetailListById";
        public static final String getOrgListByTown  = "/getOrgListByTown";
        public static final String enableOrDis  = "/enableOrDis";
        public static final String docFullInfo  = "/docFullInfo";
        public static final String docOrgDutyTreeInfo  = "/docOrgDutyTreeInfo";
        public static final String docOrgDeptTreeInfo  = "/docOrgDeptTreeInfo";
        public static final String getDoctorListByDept  = "/getDoctorListByDept";
        public static final String DOCTOR_INFO_IMPORT  = "/baseDoctorInfoImport";
        public static final String findIncentive  = "/findIncentive";
        public static final String findIncentiveById  = "/findIncentiveById";
        public static final String deleteIncentiveById  = "/deleteIncentiveById";
        public static final String saveIncentiveById  = "/saveIncentiveById";
        public static final String saveDoctorIncentive  = "/saveDoctorIncentive";
        public static final String findDoctorIncentive  = "/findDoctorIncentive";
        public static final String findDoctorOtherIncentive  = "/findDoctorOtherIncentive";
        public static final String removeIncentive  = "/removeIncentive";
        public static final String resetDoctorPwd  = "/resetDoctorPwd";
    }
    /**
     * 处方订单  BaseSensitive
     */
    public static class BaseOrder extends Basic {
        public static final String PREFIX  = "/baseOrder";
        public static final String DOCINFO  = "/docInfo";
        public static final String CREATE  = "/create";
        public static final String getOrderDetailListById  = "/getOrderDetailListById";
        public static final String enableOrDis  = "/enableOrDis";
        public static final String docFullInfo  = "/docFullInfo";
        public static final String docOrgDutyTreeInfo  = "/docOrgDutyTreeInfo";
        public static final String docOrgDeptTreeInfo  = "/docOrgDeptTreeInfo";
        public static final String getDoctorListByDept  = "/getDoctorListByDept";
        public static final String DOCTOR_INFO_IMPORT  = "/baseDoctorInfoImport";
        public static final String findIncentive  = "/findIncentive";
        public static final String findIncentiveById  = "/findIncentiveById";
        public static final String deleteIncentiveById  = "/deleteIncentiveById";
        public static final String saveIncentiveById  = "/saveIncentiveById";
        public static final String saveDoctorIncentive  = "/saveDoctorIncentive";
        public static final String findDoctorIncentive  = "/findDoctorIncentive";
        public static final String findDoctorOtherIncentive  = "/findDoctorOtherIncentive";
        public static final String removeIncentive  = "/removeIncentive";
        public static final String resetDoctorPwd  = "/resetDoctorPwd";
    }
    /**
     * 药柜设备
     */
    public static class BaseDevice extends Basic {
        public static final String PREFIX  = "/baseDevice";
        public static final String DOCINFO  = "/docInfo";
        public static final String CREATE  = "/create";
        public static final String getOrderDetailListById  = "/getOrderDetailListById";
        public static final String enableOrDis  = "/enableOrDis";
        public static final String docFullInfo  = "/docFullInfo";
        public static final String docOrgDutyTreeInfo  = "/docOrgDutyTreeInfo";
        public static final String docOrgDeptTreeInfo  = "/docOrgDeptTreeInfo";
        public static final String getDoctorListByDept  = "/getDoctorListByDept";
        public static final String DOCTOR_INFO_IMPORT  = "/baseDoctorInfoImport";
        public static final String findIncentive  = "/findIncentive";
        public static final String findIncentiveById  = "/findIncentiveById";
        public static final String deleteIncentiveById  = "/deleteIncentiveById";
        public static final String saveIncentiveById  = "/saveIncentiveById";
        public static final String saveDoctorIncentive  = "/saveDoctorIncentive";
        public static final String findDoctorIncentive  = "/findDoctorIncentive";
        public static final String findDoctorOtherIncentive  = "/findDoctorOtherIncentive";
        public static final String removeIncentive  = "/removeIncentive";
        public static final String resetDoctorPwd  = "/resetDoctorPwd";
    }
    /**
     * 药品信息  BaseSensitive
     */

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineDeviceEndpoint.java

@@ -1,29 +1,100 @@
package com.yihu.jw.base.endpoint.a4endpoint;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.service.a3service.MedicinedeviceService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.entity.base.area.BaseCityDO;
import com.yihu.jw.restmodel.base.area.BaseCityVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@Api(description = "设备管理")
@RestController
@RequestMapping("/MedicineDeviceEndpoint")
public class MedicineDeviceEndpoint {
@RequestMapping(value = BaseRequestMapping.BaseDevice.PREFIX)
@Api(value = "设备管理", description = "设备管理服务接口", tags = {"MedicineDevice - 设备管理服务接口"})
public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
    @Autowired
    MedicinedeviceService deviceService;
    @Autowired
    private ObjectMapper objectMapper;
    @Value("${wechat.id}")
    private String wechatId;
    @PostMapping(value = BaseRequestMapping.BaseDevice.CREATE)
    @ApiOperation(value = "新增药品信息")
    public Envelop create(
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) throws Exception {
        JSONObject jsonObject = null;
        String str = deviceService.createDevice(jsonData);
        jsonObject = JSONObject.parseObject(str);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("msg"));
    }
    @PostMapping(value = BaseRequestMapping.BaseDevice.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        deviceService.delete(ids.split(","));
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseDevice.UPDATE)
    @ApiOperation(value = "更新药品信息")
    public Envelop update(
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) throws Exception {
        String str = deviceService.updateDevice(jsonData);
        JSONObject jsonObject = JSONObject.parseObject(str);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("response"));
    }
    @GetMapping(value = BaseRequestMapping.BaseDevice.docFullInfo)
    @ApiOperation(value = "获取药品信息基础信息列表")
    public PageEnvelop getDeviceFullInfolist(
            @ApiParam(name = "content", value = "搜索内容")
            @RequestParam(value = "content", required = false) String content,
            @ApiParam(name = "equClass", value = "设备分类")
            @RequestParam(value = "equClass", required = false) String equClass,
            @ApiParam(name = "belongCommunity", value = "所属")
            @RequestParam(value = "belongCommunity", required = false) String belongCommunity,
            @ApiParam(name = "networkStatus", value = "网络状态")
            @RequestParam(value = "networkStatus", required = false) String networkStatus,
            @ApiParam(name = "saleStatus", value = "售卖状态")
            @RequestParam(value = "saleStatus", required = false) String saleStatus,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = deviceService.queryDeviceListFullInfo(content, equClass, belongCommunity, networkStatus, saleStatus,page,size,wechatId);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }
    @ApiOperation(value = "获取设备总数量", notes="参数未添加通过数据区域查询获取")
    @GetMapping("/countall")
    public Long countall(){

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineDrugsEndpoint.java

@@ -1,17 +1,13 @@
package com.yihu.jw.base.endpoint.a4endpoint;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.service.a3service.MedicineDrugsService;
import com.yihu.jw.base.service.a3service.MedicineOrderService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.entity.a1entity.Mediicinedrugs;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.voluntary.VoluntaryRecruitmentCompanyDO;
import com.yihu.jw.restmodel.base.doctor.BaseDoctorVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
@@ -24,23 +20,19 @@ import jxl.write.Label;
import jxl.write.WritableSheet;
import jxl.write.WritableWorkbook;
import jxl.write.WriteException;
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.FileInputStream;
import java.io.OutputStream;
import java.util.List;
@RestController
@RequestMapping(value = BaseRequestMapping.BaseDrug.PREFIX)
@Api(value = "药品信息管理", description = "药品信息管理服务接口", tags = {"wlyy基础服务 - 药品信息管理服务接口"})
@Api(value = "药品信息管理", description = "药品信息管理服务接口", tags = {"MedicineDrugs - 药品信息管理服务接口"})
public class MedicineDrugsEndpoint extends EnvelopRestEndpoint {
    @Autowired
@@ -143,7 +135,7 @@ public class MedicineDrugsEndpoint extends EnvelopRestEndpoint {
            JSONObject result = drugsService.queryDrugListFullInfo(state, content, drugClass, drugType, lowVolume, heightVolume, lowPrice, heightPrice,1,10000,wechatId);
            List<Mediicinedrugs> list = JSONObject.parseArray(result.getJSONArray("msg").toJSONString(), Mediicinedrugs.class);
            response.setContentType("octets/stream");
            response.setContentType("application/octet-stream");
            response.setHeader("Content-Disposition", "attachment; filename=" + new String("volunteerInfo.xls"));
            OutputStream os = response.getOutputStream();
            this.write(os, list);

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineOrderEndpoint.java

@@ -1,26 +1,33 @@
package com.yihu.jw.base.endpoint.a4endpoint;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.service.a3service.MedicineOrderService;
import com.yihu.jw.base.service.a3service.MedicinedeviceService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.entity.a1entity.Mediicineorderdetail;
import com.yihu.jw.entity.a1entity.Mediicinestockoutdetail;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.restmodel.base.doctor.BaseDoctorVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@Api(description = "处方订单列表")
@RestController
@RequestMapping("/MedicineOrderEndpoint")
public class MedicineOrderEndpoint {
@RequestMapping(value = BaseRequestMapping.BaseOrder.PREFIX)
@Api(value = "处方订单列表", description = "处方订单管理服务接口", tags = {"MedicineOrder - 处方订单管理服务接口"})
public class MedicineOrderEndpoint extends EnvelopRestEndpoint {
    @Autowired
    MedicinedeviceService deviceService;
    @Autowired
@@ -28,8 +35,77 @@ public class MedicineOrderEndpoint {
    @Autowired
    private ObjectMapper objectMapper;
    @Value("${wechat.id}")
    private String wechatId;
    @PostMapping(value = BaseRequestMapping.BaseOrder.CREATE)
    @ApiOperation(value = "新增处方订单信息")
    public Envelop create(
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) throws Exception {
        JSONObject jsonObject = null;
        String str = orderservice.createOrder(jsonData);
        jsonObject = JSONObject.parseObject(str);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("msg"));
    }
    @PostMapping(value = BaseRequestMapping.BaseOrder.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        orderservice.delete(ids.split(","));
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseOrder.UPDATE)
    @ApiOperation(value = "更新处方订单信息")
    public Envelop update(
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) throws Exception {
        String str = orderservice.updateOrder(jsonData);
        JSONObject jsonObject = JSONObject.parseObject(str);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("response"));
    }
    @GetMapping(value = BaseRequestMapping.BaseOrder.docFullInfo)
    @ApiOperation(value = "获取处方订单信息基础信息列表")
    public PageEnvelop getOrderFullInfolist(
            @ApiParam(name = "orderNum", value = "订单号")
            @RequestParam(value = "orderNum", required = false) String orderNum,
            @ApiParam(name = "equNum", value = "设备号")
            @RequestParam(value = "equNum", required = false) String equNum,
            @ApiParam(name = "contact", value = "手机号")
            @RequestParam(value = "contact", required = false) String contact,
            @ApiParam(name = "startTime", value = "开始时间", required = false, defaultValue = "")
            @RequestParam(value = "startTime",required = false) String startTime,
            @ApiParam(name = "endTime", value = "结束时间", required = false, defaultValue = "")
            @RequestParam(value = "endTime",required = false) String endTime,
            @ApiParam(name = "sellState", value = "出货状态")
            @RequestParam(value = "sellState", required = false) String sellState,
            @ApiParam(name = "orderState", value = "订单状态")
            @RequestParam(value = "orderState", required = false) String orderState,
            @ApiParam(name = "dispensingWindow", value = "取药区域")
            @RequestParam(value = "dispensingWindow", required = false) String dispensingWindow,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = orderservice.queryOrderListFullInfo(orderNum, equNum, contact, startTime, endTime, sellState, orderState, dispensingWindow,page,size,wechatId);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }
//------合计类
    @ApiOperation(value = "获得时间段内的销售金额", notes="获得时间段内的销售金额")
//    @GetMapping(value = BaseRequestMapping.BaseOrder.docFullInfo)
//    @ApiOperation(value = "获得时间段内的销售金额", notes="获得时间段内的销售金额")
    @GetMapping("/sumamount")
    @ApiImplicitParams({
            @ApiImplicitParam(name="beg",value="开始日期 yyyy-mm-dd",dataType="string", paramType = "query"),
@@ -48,7 +124,7 @@ public class MedicineOrderEndpoint {
        return orderservice.getcount(beg, end);
    }
    @ApiOperation(value = "获时间段内的取药品销售数量合计", notes="获取药品信息")
    @ApiOperation(value = "获时间段内的取药品销售数量合计", notes="获取处方订单信息")
    @GetMapping("/getsumquantity")
    @ApiImplicitParams({
            @ApiImplicitParam(name="beg",value="开始日期 yyyy-mm-dd",dataType="string", paramType = "query"),
@@ -59,25 +135,23 @@ public class MedicineOrderEndpoint {
//---------操作类
    @ApiOperation(value = "获取订货药品信息【订单明细】", notes="获取药品信息")
    @GetMapping("/getorderdetail")
    @ApiImplicitParams({
            @ApiImplicitParam(name="idOrder",value="订单ID",dataType="string", paramType = "query"),
           })
    public List<Mediicineorderdetail> getorderdetail(String idOrder){
        return orderservice.getorderdetail(idOrder);
    }
    @ApiOperation(value = "获取药品出货信息", notes="获取药品信息")
    @GetMapping("/getoutdetail")
    @ApiImplicitParams({
            @ApiImplicitParam(name="idOrder",value="订单ID",dataType="string", paramType = "query"),
    })
    public List<Mediicinestockoutdetail> getoutdetail(String idOrder){
        return orderservice.getoutdetail(idOrder);
    @GetMapping(value = BaseRequestMapping.BaseOrder.getOrderDetailListById)
    @ApiOperation(value = "获取订货药品信息【订单明细】" , notes="获取药品信息")
    public ListEnvelop<Mediicineorderdetail> getorderdetail(
            @ApiParam(name = "idOrder", value = "订单号", required = true)
            @RequestParam String idOrder) throws Exception {
        List<Mediicineorderdetail> baseDoctors = orderservice.getorderdetail(idOrder);
        return success(baseDoctors, Mediicineorderdetail.class);
    }
//---------众建平台，无法转移，
//    @GetMapping("getorderlist")
//    @ApiOperation("获取订单列表")

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineOutEndpoint.java

@@ -1,29 +1,108 @@
package com.yihu.jw.base.endpoint.a4endpoint;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.service.a3service.MedicineOrderService;
import com.yihu.jw.base.service.a3service.MedicineStockOutService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.entity.a1entity.Mediicinestockout;
import com.yihu.jw.entity.a1entity.Mediicinestockoutdetail;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@Api(description = "出货单")
@RestController
@RequestMapping("/MedicineOutEndpoint")
public class MedicineOutEndpoint {
@RequestMapping(value = BaseRequestMapping.BaseOut.PREFIX)
@Api(value = "出货单列表", description = "出货单管理服务接口", tags = {"MedicineOut - 出货单管理服务接口"})
public class MedicineOutEndpoint extends EnvelopRestEndpoint {
    @Autowired
    MedicineStockOutService stockoutService;
    @Autowired
    private MedicineOrderService orderservice;
    @Autowired
    private ObjectMapper objectMapper;
    @Value("${wechat.id}")
    private String wechatId;
    @PostMapping(value = BaseRequestMapping.BaseOut.CREATE)
    @ApiOperation(value = "新增出货单信息")
    public Envelop create(
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) throws Exception {
        JSONObject jsonObject = null;
        String str = stockoutService.createOut(jsonData);
        jsonObject = JSONObject.parseObject(str);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("msg"));
    }
    @PostMapping(value = BaseRequestMapping.BaseOut.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        stockoutService.delete(ids.split(","));
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseOut.UPDATE)
    @ApiOperation(value = "更新出货单信息")
    public Envelop update(
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) throws Exception {
        String str = stockoutService.updateOut(jsonData);
        JSONObject jsonObject = JSONObject.parseObject(str);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("response"));
    }
    @GetMapping(value = BaseRequestMapping.BaseOut.docFullInfo)
    @ApiOperation(value = "获取出货单信息基础信息列表")
    public PageEnvelop getOutFullInfolist(
            @ApiParam(name = "startTime", value = "开始时间", required = false, defaultValue = "")
            @RequestParam(value = "startTime",required = false) String startTime,
            @ApiParam(name = "endTime", value = "结束时间", required = false, defaultValue = "")
            @RequestParam(value = "endTime",required = false) String endTime,
            @ApiParam(name = "replenishEr", value = "补货员")
            @RequestParam(value = "replenishEr", required = false) String replenishEr,
            @ApiParam(name = "docNum", value = "单号")
            @RequestParam(value = "docNum", required = false) String docNum,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = stockoutService.queryOutListFullInfo(startTime, endTime, replenishEr, docNum,page,size,wechatId);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }
    @GetMapping(value = BaseRequestMapping.BaseOut.getOutDetailListById)
    @ApiOperation(value = "获取药品出货信息" , notes="获取药品信息")
    public ListEnvelop<Mediicinestockoutdetail> getoutdetail(
            @ApiParam(name = "idOrder", value = "订单号", required = true)
            @RequestParam String idOrder) throws Exception {
        List<Mediicinestockoutdetail> baseDoctors = orderservice.getoutdetail(idOrder);
        return success(baseDoctors, Mediicinestockoutdetail.class);
    }
    @ApiOperation(value = "读出货单列表", notes="参数未添加通过数据区域查询获取")
    @GetMapping("/list")
    public List<Mediicinestockout> list(){

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineUpEndpoint.java

@@ -1,28 +1,120 @@
package com.yihu.jw.base.endpoint.a4endpoint;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.service.a3service.MedicineStockUpService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.entity.a1entity.Mediicinestockoutdetail;
import com.yihu.jw.entity.a1entity.Mediicinestockup;
import com.yihu.jw.entity.a1entity.Mediicinestockupdetail;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@Api(description = "补货单")
@RestController
@RequestMapping("/MedicineUpEndpoint")
public class MedicineUpEndpoint {
@RequestMapping(value = BaseRequestMapping.BaseUp.PREFIX)
@Api(value = "备货单列表", description = "备货单管理服务接口", tags = {"MedicineUp - 备货单管理服务接口"})
public class MedicineUpEndpoint extends EnvelopRestEndpoint {
    @Autowired
    MedicineStockUpService stockupService;
    @Autowired
    private ObjectMapper objectMapper;
    @ApiOperation(value = "读出货单列表", notes="参数未添加通过数据区域查询获取")
    @Value("${wechat.id}")
    private String wechatId;
    @PostMapping(value = BaseRequestMapping.BaseUp.CREATE)
    @ApiOperation(value = "新增备货单信息")
    public Envelop create(
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) throws Exception {
        JSONObject jsonObject = null;
        String str = stockupService.createUp(jsonData);
        jsonObject = JSONObject.parseObject(str);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("msg"));
    }
    @PostMapping(value = BaseRequestMapping.BaseUp.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        stockupService.delete(ids.split(","));
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseUp.UPDATE)
    @ApiOperation(value = "更新备货单信息")
    public Envelop update(
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) throws Exception {
        String str = stockupService.updateUp(jsonData);
        JSONObject jsonObject = JSONObject.parseObject(str);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("response"));
    }
    @GetMapping(value = BaseRequestMapping.BaseUp.docFullInfo)
    @ApiOperation(value = "获取备货单信息基础信息列表")
    public PageEnvelop getOutFullInfolist(
            @ApiParam(name = "startTime", value = "开始时间", required = false, defaultValue = "")
            @RequestParam(value = "startTime",required = false) String startTime,
            @ApiParam(name = "endTime", value = "结束时间", required = false, defaultValue = "")
            @RequestParam(value = "endTime",required = false) String endTime,
            @ApiParam(name = "content", value = "搜索内容")
            @RequestParam(value = "content", required = false) String content,
            @ApiParam(name = "community", value = "社区")
            @RequestParam(value = "community", required = false) String community,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = stockupService.queryUpListFullInfo(startTime, endTime, content, community,page,size,wechatId);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }
//    @GetMapping(value = BaseRequestMapping.BaseOrder.getOutDetailListById)
//    @ApiOperation(value = "获取药品备货信息" , notes="获取药品信息")
//    public ListEnvelop<Mediicinestockoutdetail> getoutdetail(
//            @ApiParam(name = "idOrder", value = "订单号", required = true)
//            @RequestParam String idOrder) throws Exception {
//        List<Mediicinestockoutdetail> baseDoctors = orderservice.getoutdetail(idOrder);
//        return success(baseDoctors, Mediicinestockoutdetail.class);
//    }
    @GetMapping(value = BaseRequestMapping.BaseUp.getUpDetailListById)
    @ApiOperation(value = "备货单id获取药品备货清单信息" , notes="获取药品备货信息")
    public ListEnvelop<Mediicinestockupdetail> getupdetail(
            @ApiParam(name = "idUp", value = "备货单id", required = true)
            @RequestParam(value = "idUp") String idUp) throws Exception {
        List<Mediicinestockupdetail> baseDoctors = stockupService.getUpDetail(idUp);
        return success(baseDoctors, Mediicinestockupdetail.class);
    }
    @ApiOperation(value = "读备货单列表", notes="参数未添加通过数据区域查询获取")
    @GetMapping("/list")
    public List<Mediicinestockup> list(){
        return stockupService.getuplist();

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineWarrayEndpoint.java

@@ -1,25 +1,31 @@
package com.yihu.jw.base.endpoint.a4endpoint;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.service.a3service.MedicineOrderService;
import com.yihu.jw.base.service.a3service.MedicineWarrayService;
import com.yihu.jw.entity.a1entity.Mediicinewarray;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@Api(description = "报警信息列表")
@RestController
@RequestMapping("/MedicineUpEndpoint")
public class MedicineWarrayEndpoint {
@RequestMapping(value = BaseRequestMapping.BaseWarray.PREFIX)
@Api(value = "报警信息列表", description = "报警信息管理服务接口", tags = {"MedicineWarray - 报警信息管理服务接口"})
public class MedicineWarrayEndpoint extends EnvelopRestEndpoint {
    @Autowired
    MedicineWarrayService warraytService;
    @Autowired
@@ -27,6 +33,183 @@ public class MedicineWarrayEndpoint {
    @Autowired
    private ObjectMapper objectMapper;
    @Value("${wechat.id}")
    private String wechatId;
    @GetMapping(value = BaseRequestMapping.BaseWarray.getTemperature)
    @ApiOperation(value = "获取温度报警")
    public PageEnvelop getTemperature(
            @ApiParam(name = "idDevice", value = "设备id")
            @RequestParam(value = "idDevice", required = false) String idDevice,
            @ApiParam(name = "equClass", value = "设备分类")
            @RequestParam(value = "equClass", required = false) String equClass,
            @ApiParam(name = "networkStatus", value = "网络状态")
            @RequestParam(value = "networkStatus", required = false) String networkStatus,
            @ApiParam(name = "lowT", value = "温度下限", required = false, defaultValue = "")
            @RequestParam(value = "lowT",required = false) String lowT,
            @ApiParam(name = "heightT", value = "温度上限", required = false, defaultValue = "")
            @RequestParam(value = "heightT",required = false) String heightT,
            @ApiParam(name = "content", value = "搜索内容")
            @RequestParam(value = "content", required = false) String content,
            @ApiParam(name = "startTime", value = "开始时间", required = false, defaultValue = "")
            @RequestParam(value = "startTime",required = false) String startTime,
            @ApiParam(name = "endTime", value = "结束时间", required = false, defaultValue = "")
            @RequestParam(value = "endTime",required = false) String endTime,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = warraytService.getTemperature(idDevice, equClass,networkStatus, lowT, heightT, content,startTime, endTime,page,size,wechatId);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }
    @GetMapping(value = BaseRequestMapping.BaseWarray.getHumidity)
    @ApiOperation(value = "获取湿度报警")
    public PageEnvelop getHumidity(
            @ApiParam(name = "idDevice", value = "设备id")
            @RequestParam(value = "idDevice", required = false) String idDevice,
            @ApiParam(name = "equClass", value = "设备分类")
            @RequestParam(value = "equClass", required = false) String equClass,
            @ApiParam(name = "networkStatus", value = "网络状态")
            @RequestParam(value = "networkStatus", required = false) String networkStatus,
            @ApiParam(name = "lowH", value = "湿度下限", required = false, defaultValue = "")
            @RequestParam(value = "lowH",required = false) String lowH,
            @ApiParam(name = "heightH", value = "湿度上限", required = false, defaultValue = "")
            @RequestParam(value = "heightH",required = false) String heightH,
            @ApiParam(name = "content", value = "搜索内容")
            @RequestParam(value = "content", required = false) String content,
            @ApiParam(name = "startTime", value = "开始时间", required = false, defaultValue = "")
            @RequestParam(value = "startTime",required = false) String startTime,
            @ApiParam(name = "endTime", value = "结束时间", required = false, defaultValue = "")
            @RequestParam(value = "endTime",required = false) String endTime,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = warraytService.getHumidity(idDevice, equClass,networkStatus, lowH, heightH, content,startTime, endTime,page,size,wechatId);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }
    @GetMapping(value = BaseRequestMapping.BaseWarray.getOffline)
    @ApiOperation(value = "获取离线报警")
    public PageEnvelop getOffline(
            @ApiParam(name = "idDevice", value = "设备id")
            @RequestParam(value = "idDevice", required = false) String idDevice,
            @ApiParam(name = "equClass", value = "设备分类")
            @RequestParam(value = "equClass", required = false) String equClass,
            @ApiParam(name = "networkStatus", value = "网络状态")
            @RequestParam(value = "networkStatus", required = false) String networkStatus,
            @ApiParam(name = "content", value = "搜索内容")
            @RequestParam(value = "content", required = false) String content,
            @ApiParam(name = "startTime", value = "开始时间", required = false, defaultValue = "")
            @RequestParam(value = "startTime",required = false) String startTime,
            @ApiParam(name = "endTime", value = "结束时间", required = false, defaultValue = "")
            @RequestParam(value = "endTime",required = false) String endTime,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = warraytService.getOffline(idDevice, equClass,networkStatus, content,startTime, endTime,page,size,wechatId);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }
    @GetMapping(value = BaseRequestMapping.BaseWarray.getFault)
    @ApiOperation(value = "获取故障报警")
    public PageEnvelop getFault(
            @ApiParam(name = "idDevice", value = "设备id")
            @RequestParam(value = "idDevice", required = false) String idDevice,
            @ApiParam(name = "equClass", value = "设备分类")
            @RequestParam(value = "equClass", required = false) String equClass,
            @ApiParam(name = "networkStatus", value = "网络状态")
            @RequestParam(value = "networkStatus", required = false) String networkStatus,
            @ApiParam(name = "content", value = "搜索内容")
            @RequestParam(value = "content", required = false) String content,
            @ApiParam(name = "startTime", value = "开始时间", required = false, defaultValue = "")
            @RequestParam(value = "startTime",required = false) String startTime,
            @ApiParam(name = "endTime", value = "结束时间", required = false, defaultValue = "")
            @RequestParam(value = "endTime",required = false) String endTime,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = warraytService.getFault(idDevice, equClass,networkStatus,content,startTime, endTime,page,size,wechatId);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }
    @GetMapping(value = BaseRequestMapping.BaseWarray.getFlow)
    @ApiOperation(value = "获取流量报警")
    public PageEnvelop getFlow(
            @ApiParam(name = "idDevice", value = "设备id")
            @RequestParam(value = "idDevice", required = false) String idDevice,
            @ApiParam(name = "equClass", value = "设备分类")
            @RequestParam(value = "equClass", required = false) String equClass,
            @ApiParam(name = "networkStatus", value = "网络状态")
            @RequestParam(value = "networkStatus", required = false) String networkStatus,
            @ApiParam(name = "content", value = "搜索内容")
            @RequestParam(value = "content", required = false) String content,
            @ApiParam(name = "startTime", value = "开始时间", required = false, defaultValue = "")
            @RequestParam(value = "startTime",required = false) String startTime,
            @ApiParam(name = "endTime", value = "结束时间", required = false, defaultValue = "")
            @RequestParam(value = "endTime",required = false) String endTime,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = warraytService.getFlow(idDevice, equClass,networkStatus,content,startTime, endTime,page,size,wechatId);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }
    @GetMapping(value = BaseRequestMapping.BaseWarray.getNetwork)
    @ApiOperation(value = "获取网络报警")
    public PageEnvelop getNetwork(
            @ApiParam(name = "idDevice", value = "设备id")
            @RequestParam(value = "idDevice", required = false) String idDevice,
            @ApiParam(name = "equClass", value = "设备分类")
            @RequestParam(value = "equClass", required = false) String equClass,
            @ApiParam(name = "networkStatus", value = "网络状态")
            @RequestParam(value = "networkStatus", required = false) String networkStatus,
            @ApiParam(name = "content", value = "搜索内容")
            @RequestParam(value = "content", required = false) String content,
            @ApiParam(name = "startTime", value = "开始时间", required = false, defaultValue = "")
            @RequestParam(value = "startTime",required = false) String startTime,
            @ApiParam(name = "endTime", value = "结束时间", required = false, defaultValue = "")
            @RequestParam(value = "endTime",required = false) String endTime,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = warraytService.getNetwork(idDevice, equClass,networkStatus,content,startTime, endTime,page,size,wechatId);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }
    @GetMapping(value = BaseRequestMapping.BaseWarray.getExceed)
    @ApiOperation(value = "获取到期预警")
    public PageEnvelop getExceed(
            @ApiParam(name = "idDevice", value = "设备id")
            @RequestParam(value = "idDevice", required = false) String idDevice,
            @ApiParam(name = "equClass", value = "设备分类")
            @RequestParam(value = "equClass", required = false) String equClass,
            @ApiParam(name = "networkStatus", value = "网络状态")
            @RequestParam(value = "networkStatus", required = false) String networkStatus,
            @ApiParam(name = "type", value = "查询类型，1过期日期，2注册日期，3预警记录日期", required = false)
            @RequestParam(value = "type",required = false) String type,
            @ApiParam(name = "day", value = "多少天内过期", required = false)
            @RequestParam(value = "day",required = false) String day,
            @ApiParam(name = "content", value = "搜索内容")
            @RequestParam(value = "content", required = false) String content,
            @ApiParam(name = "startTime", value = "开始时间", required = false, defaultValue = "")
            @RequestParam(value = "startTime",required = false) String startTime,
            @ApiParam(name = "endTime", value = "结束时间", required = false, defaultValue = "")
            @RequestParam(value = "endTime",required = false) String endTime,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = warraytService.getExceed(idDevice, equClass,networkStatus, type, day, content,startTime, endTime,page,size,wechatId);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }
    //温度报警
    @ApiOperation(value = "温度报警", notes="参数未添加通过数据区域查询获取")

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

@@ -1,30 +1,19 @@
package com.yihu.jw.base.service.a3service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.dao.a2dao.MediicinedrugsDao;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.entity.a1entity.Mediicinedrugs;
import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
import com.yihu.jw.entity.base.team.BaseTeamMemberDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.hospital.mapping.DoctorMappingDO;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.utils.security.MD5;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.io.IOException;
@@ -109,13 +98,12 @@ public class MedicineDrugsService extends BaseJpaService<Mediicinedrugs, Mediici
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        String orgCode="";
        //判断药品id是否存在
        if(StringUtils.isEmpty(drug.getString("id"))){
            result.put("msg","parameter id for drug is null when update drug");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
//        if(StringUtils.isEmpty(drug.getString("id"))){
//            result.put("msg","parameter id for drug is null when update drug");
//            result.put("response", ConstantUtils.FAIL);
//            return result.toJSONString();
//        }
        Mediicinedrugs mediicinedrugs = null;
        try {
            mediicinedrugs = objectMapper.readValue(drug.toJSONString(), Mediicinedrugs.class);

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

@@ -1,25 +1,34 @@
package com.yihu.jw.base.service.a3service;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.dao.a2dao.MediicineorderDao;
import com.yihu.jw.base.dao.a2dao.MediicineorderdetailDao;
import com.yihu.jw.base.dao.a2dao.MediicinestockoutDao;
import com.yihu.jw.base.dao.a2dao.MediicinestockoutdetailDao;
import com.yihu.jw.base.dao.a2dao.*;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.entity.a1entity.Mediicinedrugs;
import com.yihu.jw.entity.a1entity.Mediicineorder;
import com.yihu.jw.entity.a1entity.Mediicineorderdetail;
import com.yihu.jw.entity.a1entity.Mediicinestockoutdetail;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.io.IOException;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
/**
 * Created by Bing on 2021/9/23.
 */
@Service
public class MedicineOrderService{
public class MedicineOrderService extends BaseJpaService<Mediicineorder, MediicineorderDao> {
    @Autowired
    private MediicineorderDao orderDao;
@@ -33,6 +42,196 @@ public class MedicineOrderService{
    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private HibenateUtils hibenateUtils;
    /**
     * 新增药品信息
     * @param jsonData
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public String createOrder(String jsonData) {
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(jsonData)){
            result.put("msg","jsonData is null");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        JSONObject order = JSONObject.parseObject(jsonData);
        if(null == order){
            result.put("msg","parameter order of jsonData is null");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        //判断订单id是否存在
//        if(StringUtils.isEmpty(order.getString("id"))){
////            result.put("msg","parameter id for order is null when update order");
////            result.put("response", ConstantUtils.FAIL);
////            return result.toJSONString();
////        }
        Mediicineorder mediicineorder = null;
        try {
            mediicineorder = objectMapper.readValue(order.toJSONString(), Mediicineorder.class);
        } catch (IOException e) {
            result.put("msg", "convert order jsonObject to BaseDoctorDO failed," + e.getCause());
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        } catch (Exception e) {
            result.put("msg", "convert order birth failed," + e.getCause());
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        this.save(mediicineorder);
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg",mediicineorder);
        return result.toJSONString();
    }
    /**
     * 修改处方订单信息
     * @param jsonData
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public String updateOrder(String jsonData){
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(jsonData)){
            result.put("msg","jsonData is null");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        JSONObject order = JSONObject.parseObject(jsonData);
        if(null == order){
            result.put("msg","parameter order of jsonData is null");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        String orgCode="";
        //判断处方订单id是否存在
        if(StringUtils.isEmpty(order.getString("id"))){
            result.put("msg","parameter id for order is null when update drug");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        Mediicineorder mediicineorder = null;
        try {
            mediicineorder = objectMapper.readValue(order.toJSONString(), Mediicineorder.class);
        } catch (IOException e) {
            result.put("msg", "convert order jsonObject to BaseDoctorDO failed," + e.getCause());
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        } catch (Exception e) {
            result.put("msg", "convert order birth failed," + e.getCause());
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        this.save(mediicineorder);
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg",mediicineorder);
        return result.toJSONString();
    }
    //orderNum, equNum, contact, startTime, endTime, sellState, orderState, dispensingWindow
    public JSONObject queryOrderListFullInfo(String orderNum, String equNum, String contact,
                                            String startTime, String endTime, String sellState,
                                            String orderState, String dispensingWindow, int page, int size,String wechatId) throws Exception {
        JSONObject result = new JSONObject();
        /*String orgCodeVale = null == orgCode ? "" : orgCode;
        String del = null == docStatus ? "" : docStatus;
        String nameOrIdcardValue = null == nameOrIdcard ? "" : "%" + nameOrIdcard + "%";
        int start = 0 == page ? page++ : (page - 1) * size;
        int end = 0 == size ? 15 : page * size;*/
        Date sTime = DateUtil.strToDate(startTime);
        Date eTime = DateUtil.strToDate(endTime);
        String sql="SELECT\n" +
                "    t.id as id,\n" +
                "    t.address as address,\n" +
                "    t.age as age,\n" +
                "    t.amount as amount,\n" +
                "    t.cargo_info as cargoInfo,\n" +
                "    t.contact as contact,\n" +
                "    t.dispensing_window as dispensingWindow,\n" +
                "    t.equ_address as equAddress,\n" +
                "    t.equ_num as equNum,\n" +
                "    t.goods_name as goodsName,\n" +
                "    t.goods_total_amount as goodsTotalAmount,\n" +
                "    t.id_num as idNum,\n" +
                "    t.info_access as infoAccess,\n" +
                "    t.`name` as `name`,\n" +
                "    t.net_sale_amount as netSaleAmount,\n" +
                "    t.order_amount as orderAmount,\n" +
                "    t.order_num as orderNum,\n" +
                "    t.order_source as orderSource,\n" +
                "    t.order_state as orderState,\n" +
                "    t.order_type as orderType,\n" +
                "    t.pay_time as payTime,\n" +
                "    t.pick_up_num as pickUpNum,\n" +
                "    t.prescribe_num as prescribeNum,\n" +
                "    t.prescribe_time as prescribeTime,\n" +
                "    t.sell_state as sellState,\n" +
                "    t.sex as sex,\n" +
                "    t.shipping_equ as shippingEqu,\n" +
                "    t.shipping_time as shippingTime,\n" +
                "    t.socialinsur_payment as socialinsurPayment,\n" +
                "    t.create_time as createTime,\n" +
                "    t.create_user as createUser,\n" +
                "    t.create_user_name as createUserName,\n" +
                "    t.update_time as updateTime,\n" +
                "    t.update_user as updateUser,\n" +
                "    t.update_user_name as updateUserName\n" +
                "FROM\n" +
                "    t_mediicine_order AS t where 1=1";
        String conditionSql = "";
        if (!StringUtils.isEmpty(orderNum)){
            conditionSql += " and t.order_num = " + orderNum;
        }
        if (!StringUtils.isEmpty(equNum)){
            conditionSql += " and t.equ_num = " + equNum;
        }
        if (!StringUtils.isEmpty(contact)){
            conditionSql += " and t.contact like '%" + contact + "%'";
        }
        if (org.apache.commons.lang.StringUtils.isNotBlank(startTime)&& org.apache.commons.lang.StringUtils.isNotBlank(endTime)){
//            conditionSql += "  AND  t.prescribe_time BETWEEN to_date('" + startTime +"','yyyy-mm-dd hh24:mi:ss') " +
//                    " AND to_date('" + endTime + "','yyyy-mm-dd hh24:mi:ss')";
            conditionSql += "  AND  t.prescribe_time >= '" + startTime +"'" +
                    " AND t.prescribe_time <= '" + endTime + "'";
        }
        if (!StringUtils.isEmpty(sellState)){
            conditionSql += " and t.sell_state = " + sellState;
        }
        if (!StringUtils.isEmpty(orderState)){
            conditionSql += " and t.order_state = " + orderState;
        }
        if (!StringUtils.isEmpty(dispensingWindow)){
            conditionSql += " and t.dispensing_window = " + dispensingWindow;
        }
        sql = sql + conditionSql;
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql,page,size);
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_order t " +
                "  where " +
                "  1=1   " +
                conditionSql;
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        int count = jdbcTemplate.queryForObject(countSql,Integer.class);
        for (Map<String,Object> map:list){
        }
        result.put("count", count);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return result;
    }
    //订单明细
    public   List<Mediicineorderdetail> getorderdetail(String idOrder) {

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

@@ -2,24 +2,194 @@ package com.yihu.jw.base.service.a3service;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.dao.a2dao.MediicineorderDao;
import com.yihu.jw.base.dao.a2dao.MediicinestockoutDao;
import com.yihu.jw.base.dao.a2dao.MediicinestockoutdetailDao;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.entity.a1entity.Mediicineorder;
import com.yihu.jw.entity.a1entity.Mediicinestockout;
import com.yihu.jw.entity.a1entity.Mediicinestockoutdetail;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.io.IOException;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
/**
 * Created by Bing on 2021/9/23.
 */
@Service
public class MedicineStockOutService {
public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, MediicinestockoutDao> {
    @Autowired
    private MediicinestockoutDao outDao;
    @Autowired
    private MediicinestockoutdetailDao outdetailDao;
    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private HibenateUtils hibenateUtils;
    /**
     * 新增药品信息
     * @param jsonData
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public String createOut(String jsonData) {
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(jsonData)){
            result.put("msg","jsonData is null");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        JSONObject order = JSONObject.parseObject(jsonData);
        if(null == order){
            result.put("msg","parameter out of jsonData is null");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        //判断订单id是否存在
//        if(StringUtils.isEmpty(order.getString("id"))){
//            result.put("msg","parameter id for out is null when update out");
//            result.put("response", ConstantUtils.FAIL);
//            return result.toJSONString();
//        }
        Mediicinestockout mediicineorder = null;
        try {
            mediicineorder = objectMapper.readValue(order.toJSONString(), Mediicinestockout.class);
        } catch (IOException e) {
            result.put("msg", "convert order jsonObject to BaseDoctorDO failed," + e.getCause());
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        } catch (Exception e) {
            result.put("msg", "convert order birth failed," + e.getCause());
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        this.save(mediicineorder);
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg",mediicineorder);
        return result.toJSONString();
    }
    /**
     * 修改处方订单信息
     * @param jsonData
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public String updateOut(String jsonData){
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(jsonData)){
            result.put("msg","jsonData is null");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        JSONObject order = JSONObject.parseObject(jsonData);
        if(null == order){
            result.put("msg","parameter order of jsonData is null");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        String orgCode="";
        //判断处方订单id是否存在
        if(StringUtils.isEmpty(order.getString("id"))){
            result.put("msg","parameter id for order is null when update drug");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        Mediicinestockout mediicineorder = null;
        try {
            mediicineorder = objectMapper.readValue(order.toJSONString(), Mediicinestockout.class);
        } catch (IOException e) {
            result.put("msg", "convert order jsonObject to BaseDoctorDO failed," + e.getCause());
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        } catch (Exception e) {
            result.put("msg", "convert order birth failed," + e.getCause());
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        this.save(mediicineorder);
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg",mediicineorder);
        return result.toJSONString();
    }
    //orderNum, equNum, contact, startTime, endTime, sellState, orderState, dispensingWindow
    public JSONObject queryOutListFullInfo(
                                             String startTime, String endTime, String replenishEr,
                                             String docNum, int page, int size,String wechatId) throws Exception {
        JSONObject result = new JSONObject();
        String sql="SELECT\n" +
                "    t.id as id,\n" +
                "    t.address as address,\n" +
                "    t.community as community,\n" +
                "    t.doc_num as docNum,\n" +
                "    t.doc_time as docTime,\n" +
                "    t.receive_state as receiveState,\n" +
                "    t.remark as remark,\n" +
                "    t.replenish_cate as replenishCate,\n" +
                "    t.replenish_equ as replenishEqu,\n" +
                "    t.replenish_er as replenishEr,\n" +
                "    t.replenish_inventory as replenishInventory,\n" +
                "    t.state as state,\n" +
                "    t.track_num as trackNum,\n" +
                "    t.create_time as createTime,\n" +
                "    t.create_user as createUser,\n" +
                "    t.create_user_name as createUserName,\n" +
                "    t.update_time as updateTime,\n" +
                "    t.update_user as updateUser,\n" +
                "    t.update_user_name as updateUserName\n" +
                "FROM\n" +
                "    t_mediicine_stockout AS t where 1=1";
        String conditionSql = "";
        if (org.apache.commons.lang.StringUtils.isNotBlank(startTime)&& org.apache.commons.lang.StringUtils.isNotBlank(endTime)){
//            conditionSql += "  AND  t.prescribe_time BETWEEN to_date('" + startTime +"','yyyy-mm-dd hh24:mi:ss') " +
//                    " AND to_date('" + endTime + "','yyyy-mm-dd hh24:mi:ss')";
            conditionSql += "  AND  t.doc_time >= '" + startTime +"'" +
                    " AND t.doc_time <= '" + endTime + "'";
        }
        if (!StringUtils.isEmpty(replenishEr)){
            conditionSql += " and t.replenish_er = " + replenishEr;
        }
        if (!StringUtils.isEmpty(docNum)){
            conditionSql += " and t.doc_num like '%" + docNum + "%'";
        }
        sql = sql + conditionSql;
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql,page,size);
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_order t " +
                "  where " +
                "  1=1   " +
                conditionSql;
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        int count = jdbcTemplate.queryForObject(countSql,Integer.class);
        for (Map<String,Object> map:list){
        }
        result.put("count", count);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return result;
    }
    //订单明细
    public List<Mediicinestockout> getoutlist() {

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

@@ -2,32 +2,199 @@ package com.yihu.jw.base.service.a3service;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.dao.a2dao.MediicinestockoutDao;
import com.yihu.jw.base.dao.a2dao.MediicinestockupDao;
import com.yihu.jw.base.dao.a2dao.MediicinestockupdetailDao;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.entity.a1entity.Mediicinestockout;
import com.yihu.jw.entity.a1entity.Mediicinestockup;
import com.yihu.jw.entity.a1entity.Mediicinestockupdetail;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
/**
 * Created by Bing on 2021/9/23.
 */
@Service
public class MedicineStockUpService{
public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, MediicinestockupDao> {
    @Autowired
    private MediicinestockupDao upDao;
    @Autowired
    private MediicinestockupdetailDao updetailDao;
    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private HibenateUtils hibenateUtils;
    /**
     * 新增备货单
     * @param jsonData
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public String createUp(String jsonData) {
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(jsonData)){
            result.put("msg","jsonData is null");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        JSONObject up = JSONObject.parseObject(jsonData);
        if(null == up){
            result.put("msg","parameter up of jsonData is null");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        //判断订单id是否存在
//        if(StringUtils.isEmpty(up.getString("id"))){
//            result.put("msg","parameter id for up is null when update up");
//            result.put("response", ConstantUtils.FAIL);
//            return result.toJSONString();
//        }
        Mediicinestockup mediicinestockup = null;
        try {
            mediicinestockup = objectMapper.readValue(up.toJSONString(), Mediicinestockup.class);
        } catch (IOException e) {
            result.put("msg", "convert up jsonObject to BaseDoctorDO failed," + e.getCause());
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        } catch (Exception e) {
            result.put("msg", "convert up birth failed," + e.getCause());
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        this.save(mediicinestockup);
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg",mediicinestockup);
        return result.toJSONString();
    }
    /**
     * 修改备货单
     * @param jsonData
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public String updateUp(String jsonData){
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(jsonData)){
            result.put("msg","jsonData is null");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        JSONObject up = JSONObject.parseObject(jsonData);
        if(null == up){
            result.put("msg","parameter up of jsonData is null");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        //判断处方订单id是否存在
        if(StringUtils.isEmpty(up.getString("id"))){
            result.put("msg","parameter id for order is null when update up");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        Mediicinestockup mediicinestockup = null;
        try {
            mediicinestockup = objectMapper.readValue(up.toJSONString(), Mediicinestockup.class);
        } catch (IOException e) {
            result.put("msg", "convert up jsonObject to BaseDoctorDO failed," + e.getCause());
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        } catch (Exception e) {
            result.put("msg", "convert up birth failed," + e.getCause());
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        this.save(mediicinestockup);
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg",mediicinestockup);
        return result.toJSONString();
    }
    public JSONObject queryUpListFullInfo(
            String startTime, String endTime, String replenishErAndTrackNum,
            String community, int page, int size,String wechatId) throws Exception {
        JSONObject result = new JSONObject();
        String sql = "SELECT\n" +
                "    t.id as id,\n" +
                "    t.community as community,\n" +
                "    t.doc_time as docTime,\n" +
                "    t.remark as remark,\n" +
                "    t.replenish_cate as replenishCate,\n" +
                "    t.replenish_equ as replenishEqu,\n" +
                "    t.replenish_er as replenishEr,\n" +
                "    t.replenish_inventory as replenishInventory,\n" +
                "    t.state as state,\n" +
                "    t.track_num as trackNum,\n" +
                "    t.create_time as createTime,\n" +
                "    t.create_user as createUser,\n" +
                "    t.create_user_name as createUserName,\n" +
                "    t.update_time as updateTime,\n" +
                "    t.update_user as updateUser,\n" +
                "    t.update_user_name as updateUserName\n" +
                "FROM\n" +
                "    t_mediicine_stockup AS t where 1=1";
        String conditionSql = "";
        //单据时间
        if (org.apache.commons.lang.StringUtils.isNotBlank(startTime)&& org.apache.commons.lang.StringUtils.isNotBlank(endTime)){
//            conditionSql += "  AND  t.prescribe_time BETWEEN to_date('" + startTime +"','yyyy-mm-dd hh24:mi:ss') " +
//                    " AND to_date('" + endTime + "','yyyy-mm-dd hh24:mi:ss')";
            conditionSql += "  AND  t.doc_time >= '" + startTime +"'" +
                    " AND t.doc_time <= '" + endTime + "'";
        }
        if (!StringUtils.isEmpty(replenishErAndTrackNum)){
            conditionSql += " and t.doc_num like '%" + replenishErAndTrackNum + "%'";
        }
        if (!StringUtils.isEmpty(community)){
            conditionSql += " and t.community = " + community;
        }
        sql = sql + conditionSql;
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql,page,size);
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_order t " +
                "  where " +
                "  1=1   " +
                conditionSql;
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        int count = jdbcTemplate.queryForObject(countSql,Integer.class);
        for (Map<String,Object> map:list){
        }
        result.put("count", count);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return result;
    }
    //订单明细
    public List<Mediicinestockup> getuplist() {
        return upDao.getlist();
    }
    //明细
    public List<Mediicinestockupdetail> getupdetail(String idstockup) {
    public List<Mediicinestockupdetail> getUpDetail(String idstockup) {
        return updetailDao.getoutdetail(idstockup);
    }
}

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

@@ -3,7 +3,11 @@ package com.yihu.jw.base.service.a3service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.dao.a2dao.MediicinestockupDao;
import com.yihu.jw.base.dao.a2dao.MediicinestoreDao;
import com.yihu.jw.entity.a1entity.Mediicinestockup;
import com.yihu.jw.entity.a1entity.Mediicinestore;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -11,7 +15,7 @@ import org.springframework.stereotype.Service;
 * Created by Bing on 2021/9/23.
 */
@Service
public class MedicineStoreService  {
public class MedicineStoreService extends BaseJpaService<Mediicinestore, MediicinestoreDao> {
    @Autowired
    private MediicinestoreDao storeDao;

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

@@ -2,21 +2,30 @@ package com.yihu.jw.base.service.a3service;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.dao.a2dao.MediicinestoreDao;
import com.yihu.jw.base.dao.a2dao.MediicinewarrayDao;
import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.entity.a1entity.Mediicinestore;
import com.yihu.jw.entity.a1entity.Mediicinewarray;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
/**
 * Created by Bing on 2021/9/23.
 */
@Service
public class MedicineWarrayService {
public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, MediicinewarrayDao> {
    @Autowired
    private MediicinewarrayDao warrayDao;
@@ -24,6 +33,652 @@ public class MedicineWarrayService {
    private ObjectMapper objectMapper;
    @Autowired
    private HibenateUtils hibenateUtils;
    public JSONObject getTemperature(
            String idDevice, String equClass, String netStatus, String lowT, String heightT,
                String content, String startTime, String endTime, int page, int size,String wechatId) throws Exception {
        JSONObject result = new JSONObject();
        String sql = "SELECT\n" +
                "    t.id as id,\n" +
                "    t.belong_community as belongCommunity,\n" +
                "    t.community as community,\n" +
                "    t.del as del,\n" +
                "    t.delivery_address as deliveryAddress,\n" +
                "    t.detail_address as detailAddress,\n" +
                "    t.equ_area as equArea,\n" +
                "    t.equ_class as equClass,\n" +
                "    t.equ_info as equInfo,\n" +
                "    t.equ_name as equName,\n" +
                "    t.equ_num as equNum,\n" +
                "    t.equ_type as equType,\n" +
                "    t.fbelong_community as fbelongCommunity,\n" +
                "    t.id_device as idDevice,\n" +
                "    t.log_time as logTime,\n" +
                "    t.machine_code as machineCode,\n" +
                "    t.network_status as networkStatus,\n" +
                "    t.poweron_test as poweronTest,\n" +
                "    t.reg_date as regDate,\n" +
                "    t.sale_status as saleStatus,\n" +
                "    t.signal_intensity as signalIntensity,\n" +
                "    t.`status` as `status`,\n" +
                "    t.type as type,\n" +
                "    t.upgr_adesit as upgrAdesit,\n" +
                "    t.duration as duration,\n" +
                "    t.exceed as exceed,\n" +
                "    t.humidity as humidity,\n" +
                "    t.other_couont as otherCouont,\n" +
                "    t.plus_couont as plusCouont,\n" +
                "    t.ship_couont as shipCouont,\n" +
                "    t.temperature as temperature,\n" +
                "    t.create_time as createTime,\n" +
                "    t.create_user as createUser,\n" +
                "    t.create_user_name as createUserName,\n" +
                "    t.update_time as updateTime,\n" +
                "    t.update_user as updateUser,\n" +
                "    t.update_user_name as updateUserName\n" +
                "FROM\n" +
                "    t_mediicine_warray AS t where 1=1";
        String conditionSql = "";
        conditionSql += " and t.type='temperature'";
        if (!StringUtils.isEmpty(idDevice)){
            conditionSql += " and t.id_device = " + idDevice;
        }
        if (!StringUtils.isEmpty(equClass)){
            conditionSql += " and t.equ_class = " + equClass;
        }
        if (!StringUtils.isEmpty(netStatus)){
            conditionSql += " and t.network_status = " + netStatus;
        }
        if (!StringUtils.isEmpty(lowT)) {
            conditionSql += " and t.temperature >= " + lowT;
        }
        if (!StringUtils.isEmpty(heightT)) {
            conditionSql += " and t.temperature <= " + heightT;
        }
        if (!StringUtils.isEmpty(content)){
            conditionSql += " and CONCAT(t.equ_name, t.equ_num) like '%" + content + "%'";
        }
        if (org.apache.commons.lang.StringUtils.isNotBlank(startTime)&& org.apache.commons.lang.StringUtils.isNotBlank(endTime)){
            conditionSql += "  AND  t.log_time >= '" + startTime +"'" +
                    " AND t.log_time <= '" + endTime + "'";
        }
        sql = sql + conditionSql;
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql,page,size);
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_warray t " +
                "  where " +
                "  1=1   " +
                conditionSql;
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        int count = jdbcTemplate.queryForObject(countSql,Integer.class);
        for (Map<String,Object> map:list){
        }
        result.put("count", count);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return result;
    }
    public JSONObject getHumidity(
            String idDevice, String equClass, String netStatus, String lowT, String heightT,
            String content, String startTime, String endTime, int page, int size,String wechatId) throws Exception {
        JSONObject result = new JSONObject();
        String sql = "SELECT\n" +
                "    t.id as id,\n" +
                "    t.belong_community as belongCommunity,\n" +
                "    t.community as community,\n" +
                "    t.del as del,\n" +
                "    t.delivery_address as deliveryAddress,\n" +
                "    t.detail_address as detailAddress,\n" +
                "    t.equ_area as equArea,\n" +
                "    t.equ_class as equClass,\n" +
                "    t.equ_info as equInfo,\n" +
                "    t.equ_name as equName,\n" +
                "    t.equ_num as equNum,\n" +
                "    t.equ_type as equType,\n" +
                "    t.fbelong_community as fbelongCommunity,\n" +
                "    t.id_device as idDevice,\n" +
                "    t.log_time as logTime,\n" +
                "    t.machine_code as machineCode,\n" +
                "    t.network_status as networkStatus,\n" +
                "    t.poweron_test as poweronTest,\n" +
                "    t.reg_date as regDate,\n" +
                "    t.sale_status as saleStatus,\n" +
                "    t.signal_intensity as signalIntensity,\n" +
                "    t.`status` as `status`,\n" +
                "    t.type as type,\n" +
                "    t.upgr_adesit as upgrAdesit,\n" +
                "    t.duration as duration,\n" +
                "    t.exceed as exceed,\n" +
                "    t.humidity as humidity,\n" +
                "    t.other_couont as otherCouont,\n" +
                "    t.plus_couont as plusCouont,\n" +
                "    t.ship_couont as shipCouont,\n" +
                "    t.temperature as temperature,\n" +
                "    t.create_time as createTime,\n" +
                "    t.create_user as createUser,\n" +
                "    t.create_user_name as createUserName,\n" +
                "    t.update_time as updateTime,\n" +
                "    t.update_user as updateUser,\n" +
                "    t.update_user_name as updateUserName\n" +
                "FROM\n" +
                "    t_mediicine_warray AS t where 1=1";
        String conditionSql = "";
        conditionSql += " and t.type='humidity'";
        if (!StringUtils.isEmpty(idDevice)){
            conditionSql += " and t.id_device = " + idDevice;
        }
        if (!StringUtils.isEmpty(equClass)){
            conditionSql += " and t.equ_class = " + equClass;
        }
        if (!StringUtils.isEmpty(netStatus)){
            conditionSql += " and t.network_status = " + netStatus;
        }
        if (!StringUtils.isEmpty(lowT)) {
            conditionSql += " and t.humidity >= " + lowT;
        }
        if (!StringUtils.isEmpty(heightT)) {
            conditionSql += " and t.humidity <= " + heightT;
        }
        if (!StringUtils.isEmpty(content)){
            conditionSql += " and CONCAT(t.equ_name, t.equ_num) like '%" + content + "%'";
        }
        if (org.apache.commons.lang.StringUtils.isNotBlank(startTime)&& org.apache.commons.lang.StringUtils.isNotBlank(endTime)){
            conditionSql += "  AND  t.log_time >= '" + startTime +"'" +
                    " AND t.log_time <= '" + endTime + "'";
        }
        sql = sql + conditionSql;
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql,page,size);
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_warray t " +
                "  where " +
                "  1=1   " +
                conditionSql;
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        int count = jdbcTemplate.queryForObject(countSql,Integer.class);
        for (Map<String,Object> map:list){
        }
        result.put("count", count);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return result;
    }
    public JSONObject getOffline(
            String idDevice, String equClass, String netStatus, String content,
            String startTime, String endTime, int page, int size,String wechatId) throws Exception {
        JSONObject result = new JSONObject();
        String sql = "SELECT\n" +
                "    t.id as id,\n" +
                "    t.belong_community as belongCommunity,\n" +
                "    t.community as community,\n" +
                "    t.del as del,\n" +
                "    t.delivery_address as deliveryAddress,\n" +
                "    t.detail_address as detailAddress,\n" +
                "    t.equ_area as equArea,\n" +
                "    t.equ_class as equClass,\n" +
                "    t.equ_info as equInfo,\n" +
                "    t.equ_name as equName,\n" +
                "    t.equ_num as equNum,\n" +
                "    t.equ_type as equType,\n" +
                "    t.fbelong_community as fbelongCommunity,\n" +
                "    t.id_device as idDevice,\n" +
                "    t.log_time as logTime,\n" +
                "    t.machine_code as machineCode,\n" +
                "    t.network_status as networkStatus,\n" +
                "    t.poweron_test as poweronTest,\n" +
                "    t.reg_date as regDate,\n" +
                "    t.sale_status as saleStatus,\n" +
                "    t.signal_intensity as signalIntensity,\n" +
                "    t.`status` as `status`,\n" +
                "    t.type as type,\n" +
                "    t.upgr_adesit as upgrAdesit,\n" +
                "    t.duration as duration,\n" +
                "    t.exceed as exceed,\n" +
                "    t.humidity as humidity,\n" +
                "    t.other_couont as otherCouont,\n" +
                "    t.plus_couont as plusCouont,\n" +
                "    t.ship_couont as shipCouont,\n" +
                "    t.temperature as temperature,\n" +
                "    t.create_time as createTime,\n" +
                "    t.create_user as createUser,\n" +
                "    t.create_user_name as createUserName,\n" +
                "    t.update_time as updateTime,\n" +
                "    t.update_user as updateUser,\n" +
                "    t.update_user_name as updateUserName\n" +
                "FROM\n" +
                "    t_mediicine_warray AS t where 1=1";
        String conditionSql = "";
        conditionSql += " and t.type='offline'";
        if (!StringUtils.isEmpty(idDevice)){
            conditionSql += " and t.id_device = " + idDevice;
        }
        if (!StringUtils.isEmpty(equClass)){
            conditionSql += " and t.equ_class = " + equClass;
        }
        if (!StringUtils.isEmpty(netStatus)){
            conditionSql += " and t.network_status = " + netStatus;
        }
        if (!StringUtils.isEmpty(content)){
            conditionSql += " and CONCAT(t.equ_name, t.equ_num) like '%" + content + "%'";
        }
        if (org.apache.commons.lang.StringUtils.isNotBlank(startTime)&& org.apache.commons.lang.StringUtils.isNotBlank(endTime)){
            conditionSql += "  AND  t.log_time >= '" + startTime +"'" +
                    " AND t.log_time <= '" + endTime + "'";
        }
        sql = sql + conditionSql;
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql,page,size);
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_warray t " +
                "  where " +
                "  1=1   " +
                conditionSql;
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        int count = jdbcTemplate.queryForObject(countSql,Integer.class);
        for (Map<String,Object> map:list){
        }
        result.put("count", count);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return result;
    }
    public JSONObject getFault(
            String idDevice, String equClass, String netStatus, String content,
            String startTime, String endTime, int page, int size,String wechatId) throws Exception {
        JSONObject result = new JSONObject();
        String sql = "SELECT\n" +
                "    t.id as id,\n" +
                "    t.belong_community as belongCommunity,\n" +
                "    t.community as community,\n" +
                "    t.del as del,\n" +
                "    t.delivery_address as deliveryAddress,\n" +
                "    t.detail_address as detailAddress,\n" +
                "    t.equ_area as equArea,\n" +
                "    t.equ_class as equClass,\n" +
                "    t.equ_info as equInfo,\n" +
                "    t.equ_name as equName,\n" +
                "    t.equ_num as equNum,\n" +
                "    t.equ_type as equType,\n" +
                "    t.fbelong_community as fbelongCommunity,\n" +
                "    t.id_device as idDevice,\n" +
                "    t.log_time as logTime,\n" +
                "    t.machine_code as machineCode,\n" +
                "    t.network_status as networkStatus,\n" +
                "    t.poweron_test as poweronTest,\n" +
                "    t.reg_date as regDate,\n" +
                "    t.sale_status as saleStatus,\n" +
                "    t.signal_intensity as signalIntensity,\n" +
                "    t.`status` as `status`,\n" +
                "    t.type as type,\n" +
                "    t.upgr_adesit as upgrAdesit,\n" +
                "    t.duration as duration,\n" +
                "    t.exceed as exceed,\n" +
                "    t.humidity as humidity,\n" +
                "    t.other_couont as otherCouont,\n" +
                "    t.plus_couont as plusCouont,\n" +
                "    t.ship_couont as shipCouont,\n" +
                "    t.temperature as temperature,\n" +
                "    t.create_time as createTime,\n" +
                "    t.create_user as createUser,\n" +
                "    t.create_user_name as createUserName,\n" +
                "    t.update_time as updateTime,\n" +
                "    t.update_user as updateUser,\n" +
                "    t.update_user_name as updateUserName\n" +
                "FROM\n" +
                "    t_mediicine_warray AS t where 1=1";
        String conditionSql = "";
        conditionSql += " and t.type='fault'";
        if (!StringUtils.isEmpty(idDevice)){
            conditionSql += " and t.id_device = " + idDevice;
        }
        if (!StringUtils.isEmpty(equClass)){
            conditionSql += " and t.equ_class = " + equClass;
        }
        if (!StringUtils.isEmpty(netStatus)){
            conditionSql += " and t.network_status = " + netStatus;
        }
        if (!StringUtils.isEmpty(content)){
            conditionSql += " and CONCAT(t.equ_name, t.equ_num) like '%" + content + "%'";
        }
        if (org.apache.commons.lang.StringUtils.isNotBlank(startTime)&& org.apache.commons.lang.StringUtils.isNotBlank(endTime)){
            conditionSql += "  AND  t.log_time >= '" + startTime +"'" +
                    " AND t.log_time <= '" + endTime + "'";
        }
        sql = sql + conditionSql;
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql,page,size);
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_warray t " +
                "  where " +
                "  1=1   " +
                conditionSql;
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        int count = jdbcTemplate.queryForObject(countSql,Integer.class);
        for (Map<String,Object> map:list){
        }
        result.put("count", count);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return result;
    }
    public JSONObject getFlow(
            String idDevice, String equClass, String netStatus, String content,
            String startTime, String endTime, int page, int size,String wechatId) throws Exception {
        JSONObject result = new JSONObject();
        String sql = "SELECT\n" +
                "    t.id as id,\n" +
                "    t.belong_community as belongCommunity,\n" +
                "    t.community as community,\n" +
                "    t.del as del,\n" +
                "    t.delivery_address as deliveryAddress,\n" +
                "    t.detail_address as detailAddress,\n" +
                "    t.equ_area as equArea,\n" +
                "    t.equ_class as equClass,\n" +
                "    t.equ_info as equInfo,\n" +
                "    t.equ_name as equName,\n" +
                "    t.equ_num as equNum,\n" +
                "    t.equ_type as equType,\n" +
                "    t.fbelong_community as fbelongCommunity,\n" +
                "    t.id_device as idDevice,\n" +
                "    t.log_time as logTime,\n" +
                "    t.machine_code as machineCode,\n" +
                "    t.network_status as networkStatus,\n" +
                "    t.poweron_test as poweronTest,\n" +
                "    t.reg_date as regDate,\n" +
                "    t.sale_status as saleStatus,\n" +
                "    t.signal_intensity as signalIntensity,\n" +
                "    t.`status` as `status`,\n" +
                "    t.type as type,\n" +
                "    t.upgr_adesit as upgrAdesit,\n" +
                "    t.duration as duration,\n" +
                "    t.exceed as exceed,\n" +
                "    t.humidity as humidity,\n" +
                "    t.other_couont as otherCouont,\n" +
                "    t.plus_couont as plusCouont,\n" +
                "    t.ship_couont as shipCouont,\n" +
                "    t.temperature as temperature,\n" +
                "    t.create_time as createTime,\n" +
                "    t.create_user as createUser,\n" +
                "    t.create_user_name as createUserName,\n" +
                "    t.update_time as updateTime,\n" +
                "    t.update_user as updateUser,\n" +
                "    t.update_user_name as updateUserName\n" +
                "FROM\n" +
                "    t_mediicine_warray AS t where 1=1";
        String conditionSql = "";
        conditionSql += " and t.type='flow'";
        if (!StringUtils.isEmpty(idDevice)){
            conditionSql += " and t.id_device = " + idDevice;
        }
        if (!StringUtils.isEmpty(equClass)){
            conditionSql += " and t.equ_class = " + equClass;
        }
        if (!StringUtils.isEmpty(netStatus)){
            conditionSql += " and t.network_status = " + netStatus;
        }
        if (!StringUtils.isEmpty(content)){
            conditionSql += " and CONCAT(t.equ_name, t.equ_num) like '%" + content + "%'";
        }
        if (org.apache.commons.lang.StringUtils.isNotBlank(startTime)&& org.apache.commons.lang.StringUtils.isNotBlank(endTime)){
            conditionSql += "  AND  t.log_time >= '" + startTime +"'" +
                    " AND t.log_time <= '" + endTime + "'";
        }
        sql = sql + conditionSql;
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql,page,size);
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_warray t " +
                "  where " +
                "  1=1   " +
                conditionSql;
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        int count = jdbcTemplate.queryForObject(countSql,Integer.class);
        for (Map<String,Object> map:list){
        }
        result.put("count", count);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return result;
    }
    public JSONObject getNetwork(
            String idDevice, String equClass, String netStatus, String content,
            String startTime, String endTime, int page, int size,String wechatId) throws Exception {
        JSONObject result = new JSONObject();
        String sql = "SELECT\n" +
                "    t.id as id,\n" +
                "    t.belong_community as belongCommunity,\n" +
                "    t.community as community,\n" +
                "    t.del as del,\n" +
                "    t.delivery_address as deliveryAddress,\n" +
                "    t.detail_address as detailAddress,\n" +
                "    t.equ_area as equArea,\n" +
                "    t.equ_class as equClass,\n" +
                "    t.equ_info as equInfo,\n" +
                "    t.equ_name as equName,\n" +
                "    t.equ_num as equNum,\n" +
                "    t.equ_type as equType,\n" +
                "    t.fbelong_community as fbelongCommunity,\n" +
                "    t.id_device as idDevice,\n" +
                "    t.log_time as logTime,\n" +
                "    t.machine_code as machineCode,\n" +
                "    t.network_status as networkStatus,\n" +
                "    t.poweron_test as poweronTest,\n" +
                "    t.reg_date as regDate,\n" +
                "    t.sale_status as saleStatus,\n" +
                "    t.signal_intensity as signalIntensity,\n" +
                "    t.`status` as `status`,\n" +
                "    t.type as type,\n" +
                "    t.upgr_adesit as upgrAdesit,\n" +
                "    t.duration as duration,\n" +
                "    t.exceed as exceed,\n" +
                "    t.humidity as humidity,\n" +
                "    t.other_couont as otherCouont,\n" +
                "    t.plus_couont as plusCouont,\n" +
                "    t.ship_couont as shipCouont,\n" +
                "    t.temperature as temperature,\n" +
                "    t.create_time as createTime,\n" +
                "    t.create_user as createUser,\n" +
                "    t.create_user_name as createUserName,\n" +
                "    t.update_time as updateTime,\n" +
                "    t.update_user as updateUser,\n" +
                "    t.update_user_name as updateUserName\n" +
                "FROM\n" +
                "    t_mediicine_warray AS t where 1=1";
        String conditionSql = "";
        conditionSql += " and t.type='network'";
        if (!StringUtils.isEmpty(idDevice)){
            conditionSql += " and t.id_device = " + idDevice;
        }
        if (!StringUtils.isEmpty(equClass)){
            conditionSql += " and t.equ_class = " + equClass;
        }
        if (!StringUtils.isEmpty(netStatus)){
            conditionSql += " and t.network_status = " + netStatus;
        }
        if (!StringUtils.isEmpty(content)){
            conditionSql += " and CONCAT(t.equ_name, t.equ_num) like '%" + content + "%'";
        }
        if (org.apache.commons.lang.StringUtils.isNotBlank(startTime)&& org.apache.commons.lang.StringUtils.isNotBlank(endTime)){
            conditionSql += "  AND  t.log_time >= '" + startTime +"'" +
                    " AND t.log_time <= '" + endTime + "'";
        }
        sql = sql + conditionSql;
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql,page,size);
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_warray t " +
                "  where " +
                "  1=1   " +
                conditionSql;
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        int count = jdbcTemplate.queryForObject(countSql,Integer.class);
        for (Map<String,Object> map:list){
        }
        result.put("count", count);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return result;
    }
    //到期预警
    public JSONObject getExceed(
            String idDevice, String equClass, String netStatus, String type, String day,
            String content, String startTime, String endTime, int page, int size,String wechatId) throws Exception {
        JSONObject result = new JSONObject();
        String sql = "SELECT\n" +
                "    t.id as id,\n" +
                "    t.belong_community as belongCommunity,\n" +
                "    t.community as community,\n" +
                "    t.del as del,\n" +
                "    t.delivery_address as deliveryAddress,\n" +
                "    t.detail_address as detailAddress,\n" +
                "    t.equ_area as equArea,\n" +
                "    t.equ_class as equClass,\n" +
                "    t.equ_info as equInfo,\n" +
                "    t.equ_name as equName,\n" +
                "    t.equ_num as equNum,\n" +
                "    t.equ_type as equType,\n" +
                "    t.fbelong_community as fbelongCommunity,\n" +
                "    t.id_device as idDevice,\n" +
                "    t.log_time as logTime,\n" +
                "    t.machine_code as machineCode,\n" +
                "    t.network_status as networkStatus,\n" +
                "    t.poweron_test as poweronTest,\n" +
                "    t.reg_date as regDate,\n" +
                "    t.sale_status as saleStatus,\n" +
                "    t.signal_intensity as signalIntensity,\n" +
                "    t.`status` as `status`,\n" +
                "    t.type as type,\n" +
                "    t.upgr_adesit as upgrAdesit,\n" +
                "    t.duration as duration,\n" +
                "    t.exceed as exceed,\n" +
                "    t.humidity as humidity,\n" +
                "    t.other_couont as otherCouont,\n" +
                "    t.plus_couont as plusCouont,\n" +
                "    t.ship_couont as shipCouont,\n" +
                "    t.temperature as temperature,\n" +
                "    t.create_time as createTime,\n" +
                "    t.create_user as createUser,\n" +
                "    t.create_user_name as createUserName,\n" +
                "    t.update_time as updateTime,\n" +
                "    t.update_user as updateUser,\n" +
                "    t.update_user_name as updateUserName\n" +
                "FROM\n" +
                "    t_mediicine_warray AS t where 1=1";
        String conditionSql = "";
        conditionSql += " and t.type='exceed'";
        if (!StringUtils.isEmpty(idDevice)){
            conditionSql += " and t.id_device = " + idDevice;
        }
        if (!StringUtils.isEmpty(equClass)){
            conditionSql += " and t.equ_class = " + equClass;
        }
        if (!StringUtils.isEmpty(netStatus)){
            conditionSql += " and t.network_status = " + netStatus;
        }
        if (!StringUtils.isEmpty(content)){
            conditionSql += " and CONCAT(t.equ_name, t.equ_num) like '%" + content + "%'";
        }
        if (!StringUtils.isEmpty(type)) {
            if("1".equalsIgnoreCase(type)){
                if (org.apache.commons.lang.StringUtils.isNotBlank(startTime)&& org.apache.commons.lang.StringUtils.isNotBlank(endTime)){
                    conditionSql += "  AND  t.exceed >= '" + startTime +"'" +
                            " AND t.exceed <= '" + endTime + "'";
                }
            }
            if("2".equalsIgnoreCase(type)){
                if (org.apache.commons.lang.StringUtils.isNotBlank(startTime)&& org.apache.commons.lang.StringUtils.isNotBlank(endTime)){
                    conditionSql += "  AND  t.reg_date >= '" + startTime +"'" +
                            " AND t.reg_date <= '" + endTime + "'";
                }
            }
            if ("3".equalsIgnoreCase(type)) {
                if (org.apache.commons.lang.StringUtils.isNotBlank(startTime)&& org.apache.commons.lang.StringUtils.isNotBlank(endTime)){
                    conditionSql += "  AND  t.log_time >= '" + startTime +"'" +
                            " AND t.log_time <= '" + endTime + "'";
                }
            }
        }
        if (!StringUtils.isEmpty(day)) {
            conditionSql += " and t.exceed < date_add(curdate(), interval " + day + " day)";
        }
        sql = sql + conditionSql;
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql,page,size);
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_warray t " +
                "  where " +
                "  1=1   " +
                conditionSql;
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        int count = jdbcTemplate.queryForObject(countSql,Integer.class);
        for (Map<String,Object> map:list){
        }
        result.put("count", count);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return result;
    }
    //温度报警
    public List<Mediicinewarray> gettemperature(String idDevice, String equClass, float networkStatus, float temperaturebeg, float temperatureend, String codename, String beg, String end) {
        Date startDate = DateUtil.strToDateShort(beg);

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

@@ -5,22 +5,205 @@ import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.dao.a2dao.MediicineDeviceDao;
import com.yihu.jw.base.dao.a2dao.MediicinedrugsDao;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.entity.a1entity.Mediicinedevice;
import com.yihu.jw.entity.a1entity.Mediicinedrugs;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
/**
 * Created by Bing on 2021/9/23.
 */
@Service
public class MedicinedeviceService  {
public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, MediicineDeviceDao> {
    @Autowired
    private MediicineDeviceDao deviceDao;
    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private HibenateUtils hibenateUtils;
    /**
     * 新增设备
     * @param jsonData
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public String createDevice(String jsonData) {
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(jsonData)){
            result.put("msg","jsonData is null");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        JSONObject device = JSONObject.parseObject(jsonData);
        if(null == device){
            result.put("msg","parameter device of jsonData is null");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        //判断设备id是否存在
//        if(StringUtils.isEmpty(device.getString("id"))){
//            result.put("msg","parameter id for device is null when update device");
//            result.put("response", ConstantUtils.FAIL);
//            return result.toJSONString();
//        }
        Mediicinedevice mediicinedevice = null;
        try {
            mediicinedevice = objectMapper.readValue(device.toJSONString(), Mediicinedevice.class);
        } catch (IOException e) {
            result.put("msg", "convert device jsonObject to BaseDoctorDO failed," + e.getCause());
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        } catch (Exception e) {
            result.put("msg", "convert device birth failed," + e.getCause());
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        this.save(mediicinedevice);
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg",mediicinedevice);
        return result.toJSONString();
    }
    /**
     * 修改设备
     * @param jsonData
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public String updateDevice(String jsonData){
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(jsonData)){
            result.put("msg","jsonData is null");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        JSONObject device = JSONObject.parseObject(jsonData);
        if(null == device){
            result.put("msg","parameter device of jsonData is null");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        String orgCode="";
        //判断设备id是否存在
        if(StringUtils.isEmpty(device.getString("id"))){
            result.put("msg","parameter id for device is null when update device");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        Mediicinedevice mediicinedevice = null;
        try {
            mediicinedevice = objectMapper.readValue(device.toJSONString(), Mediicinedevice.class);
        } catch (IOException e) {
            result.put("msg", "convert device jsonObject to BaseDoctorDO failed," + e.getCause());
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        } catch (Exception e) {
            result.put("msg", "convert device birth failed," + e.getCause());
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        this.save(mediicinedevice);
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg",mediicinedevice);
        return result.toJSONString();
    }
    public JSONObject queryDeviceListFullInfo(String content, String equClass, String belongCommunity,
                                            String networkStatus, String saleStatus, int page, int size,String wechatId) throws Exception {
        JSONObject result = new JSONObject();
        String sql = "SELECT\n" +
                "    t.id as id,\n" +
                "    t.belong_community as belongCommunity,\n" +
                "    t.community as community,\n" +
                "    t.del as del,\n" +
                "    t.delivery_address as deliveryAddress,\n" +
                "    t.detail_address as detailAddress,\n" +
                "    t.equ_area as equArea,\n" +
                "    t.equ_class as equClass,\n" +
                "    t.equ_info as equInfo,\n" +
                "    t.equ_name as equName,\n" +
                "    t.equ_num as equNum,\n" +
                "    t.equ_type as equType,\n" +
                "    t.fbelong_community as fbelongCommunity,\n" +
                "    t.machine_code as machineCode,\n" +
                "    t.network_status as networkStatus,\n" +
                "    t.poweron_test as poweronTest,\n" +
                "    t.reg_date as regDate,\n" +
                "    t.sale_status as saleStatus,\n" +
                "    t.signalintensity as signalintensity,\n" +
                "    t.upgr_adesit as upgrAdesit,\n" +
                "    t.`status` as `status`,\n" +
                "    t.card_status as cardStatus,\n" +
                "    t.operator as operator,\n" +
                "    t.pack_age as packAge,\n" +
                "    t.usage_flow as usageFlow,\n" +
                "    t.flow as flow,\n" +
                "    t.create_time as createTime,\n" +
                "    t.create_user as createUser,\n" +
                "    t.create_user_name as createUserName,\n" +
                "    t.update_time as updateTime,\n" +
                "    t.update_user as updateUser,\n" +
                "    t.update_user_name as updateUserName\n" +
                "FROM\n" +
                "    t_mediicine_device AS t where 1=1\n";
        String conditionSql = "";
        if (!StringUtils.isEmpty(content)){
            conditionSql += " and CONCAT(t.equ_name, t.equ_num) like '%" + content + "%'";
        }
        if (!StringUtils.isEmpty(equClass)){
            conditionSql += " and t.equ_class = "+equClass;
        }
        if (!StringUtils.isEmpty(belongCommunity)){
            conditionSql += " and t.belong_community = " + belongCommunity;
        }
        if (!StringUtils.isEmpty(networkStatus)){
            conditionSql += " and t.network_status = " + networkStatus;
        }
        if (!StringUtils.isEmpty(saleStatus)){
            conditionSql += " and t.sale_status = " + saleStatus;
        }
        sql = sql + conditionSql;
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql,page,size);
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_device t " +
                "  where " +
                "  1=1   " +
                conditionSql;
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        int count = jdbcTemplate.queryForObject(countSql,Integer.class);
        for (Map<String,Object> map:list){
        }
        result.put("count", count);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return result;
    }
    //获取当前设备数量
    public  long countAll() {
        return deviceDao.countAll();