Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

pom.xml

@@ -20,7 +20,7 @@
 <!--        <module>pims</module>-->
 <!--        <module>health</module>-->
 <!--        <module>ct</module>-->
-<!--        <module>tcm</module>-->
+        <module>tcm</module>
 <!--        <module>ocr</module>-->
 
     </modules>

tall/src/main/resources/application-dev.yml

@@ -11,11 +11,11 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
   rabbitmq:
-    #    host: 192.168.4.113
+    host: 192.168.4.113
-    host: 127.0.0.1
+    #host: 127.0.0.1
-    password: guest
+    password: 111111
     port: 5672
-    username: guest
+    username: admin
   redis:
     database: 0
     host: 127.0.0.1

tcm/src/main/java/com/ccsens/tcm/service/PatientService.java

@@ -268,9 +268,6 @@ public class PatientService implements IPatientService {
 
     @Override
     public PageInfo<PatientVo.SelPatient> selPatientInformationList(PatientDto.SelPatientList param, Long userId) {
-        PageHelper.startPage(param.getPageNum(),param.getPageSize());
-
-
         if (param.getQueryAuthority() == Constant.QUERY_AUTHORITY_HOSPITAL) {
             List<DoctorVo.Detail> doctors = doctorDao.queryDetail(userId);
             for (DoctorVo.Detail doctor: doctors) {
@@ -284,6 +281,7 @@ public class PatientService implements IPatientService {
                 }
             }
         }
+        PageHelper.startPage(param.getPageNum(),param.getPageSize());
         List<PatientVo.SelPatient> selPatientList= patientDao.selPatientInformationList(param, userId);
         return new PageInfo<>(selPatientList);
     }

tcm/src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ spring:
   rabbitmq:
 #    host: 192.144.182.42
 #    host: test.tall.wiki
-    host: 192.168.31.13
+    host: 192.168.4.113
     password: 111111
     port: 5672
     username: admin

tcm/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: prod
+    active: dev
-    include: common, util-prod
+    include: common, util-dev
 

tcm/src/main/resources/druid-dev.yml

@@ -16,8 +16,8 @@ spring:
       minEvictableIdleTimeMillis: 300000
       minIdle: 5
 #      password: 37080c1f223685592316b02dad8816c019290a476e54ebb638f9aa3ba8b6bdb9
-#      password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
+      password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
-      password: 6ba13d9930a6ad888a3704376c920a75
+#      password: 6ba13d9930a6ad888a3704376c920a75
       poolPreparedStatements: true
       servletLogSlowSql: true
       servletLoginPassword: 111111
@@ -29,11 +29,11 @@ spring:
       testOnReturn: false
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
-#      url: jdbc:mysql://49.233.89.188:3306/tcm?useUnicode=true&characterEncoding=UTF-8
+      url: jdbc:mysql://49.233.89.188:3306/tcm?useUnicode=true&characterEncoding=UTF-8
-      url: jdbc:mysql://49.232.6.143:3306/tcm?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
+#      url: jdbc:mysql://49.232.6.143:3306/tcm?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
 #      url: jdbc:mysql://127.0.0.1/mt?useUnicode=true&characterEncoding=UTF-8
       username: root
       validationQuery: SELECT 1 FROM DUAL
 #      env: CCSENS_GAME
-#      env: CCSENS_TALL
+      env: CCSENS_TALL
-      env: CCSENS_GREENVALLEY
+#      env: CCSENS_GREENVALLEY

tcm/src/main/resources/mapper_dao/PatientDao.xml

@@ -52,7 +52,7 @@
             tpi.user_id as userId,
             d.`name` as doctorName
         FROM
-            t_patient_information tpi left join t_inpatient ti on ti.rec_status=0 and ti.id=tpi.inpatient_id
+            t_patient_information tpi left join t_inpatient ti on ti.rec_status IN ( 0, 1 ) and ti.id=tpi.inpatient_id
             left join t_hospital th on th.rec_status=0 and th.id=tpi.hospital_id
         LEFT JOIN t_doctor d on tpi.user_id = d.user_id and d.rec_status = 0
         WHERE
@@ -161,7 +161,7 @@
         tpi.user_id as userId,
         d.`name` as doctorName
         FROM
-        t_patient_information tpi left join t_inpatient ti on ti.rec_status=0 and ti.id=tpi.inpatient_id
+        t_patient_information tpi left join t_inpatient ti on ti.rec_status in(0 , 1) and ti.id=tpi.inpatient_id
         LEFT JOIN t_doctor d on d.user_id = tpi.user_id and d.rec_status = 0
         WHERE
         tpi.rec_status =0

wisdomcar/src/main/java/com/ccsens/wisdomcar/api/RfidController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * @author 逗
@@ -65,4 +66,22 @@ public class RfidController {
         log.info("分页查找rfid成功，{}",queryRfidPageInfo);
         return JsonResponse.newInstance().ok(queryRfidPageInfo);
     }
+
+    @ApiOperation(value = "查询医院列表", notes = "")
+    @RequestMapping(value = "/queryHospitalList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<RfidVo.HospitalList>> queryHospitalList(@ApiParam @Validated @RequestBody QueryDto<RfidDto.QueryHospital> params) {
+        log.info("分页查找rfid：{}",params);
+        List<RfidVo.HospitalList> queryHospitalList = rfidService.queryHospitalList(params.getParam());
+        log.info("分页查找rfid成功，{}",queryHospitalList);
+        return JsonResponse.newInstance().ok(queryHospitalList);
+    }
+
+    @ApiOperation(value = "查询环节列表", notes = "")
+    @RequestMapping(value = "/queryStepList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<RfidVo.StepList>> queryStepList(@ApiParam @Validated @RequestBody QueryDto<RfidDto.QueryStep> params) {
+        log.info("分页查找rfid：{}",params);
+        List<RfidVo.StepList> queryHospitalList = rfidService.queryStepList(params.getParam());
+        log.info("分页查找rfid成功，{}",queryHospitalList);
+        return JsonResponse.newInstance().ok(queryHospitalList);
+    }
 }

wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/RfidDto.java

@@ -4,6 +4,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
 /**
  * @author 逗
  */
@@ -14,56 +17,75 @@ public class RfidDto {
     @Data
     @ApiModel("添加rfid")
     public static class SaveRfid{
+        @NotEmpty(message = "请输入rfid")
         @ApiModelProperty("rfid")
-        private Long rfid;
+        private String rfid;
+        @NotNull(message = "请选择rfid类型")
         @ApiModelProperty("类型 0医生 1采血车 2门禁")
         private byte type;
+        @NotEmpty(message = "请输入rfid名称")
         @ApiModelProperty("名称")
         private String name;
         @ApiModelProperty("环节")
-        private byte stop;
+        private Long step;
+        @NotNull(message = "请选择绑定的医院")
         @ApiModelProperty("医院id")
-        private byte hospitalId;
+        private Long hospitalId;
     }
 
     @Data
-    @ApiModel("添加rfid")
+    @ApiModel("删除rfid")
     public static class DelRfid{
+        @NotNull(message = "请选择要删除的rfid")
         @ApiModelProperty("rfid表的id")
         private Long id;
     }
 
     @Data
-    @ApiModel("添加rfid")
+    @ApiModel("修改rfid")
     public static class UpdateRfid{
+        @NotNull(message = "请选择要删除的rfid")
         @ApiModelProperty("rfid表的id")
         private Long id;
         @ApiModelProperty("rfid")
-        private Long rfid;
+        private String rfid;
         @ApiModelProperty("类型 0医生 1采血车 2门禁")
         private byte type;
         @ApiModelProperty("名称")
         private String name;
         @ApiModelProperty("环节")
-        private byte stop;
+        private Long step;
         @ApiModelProperty("医院id")
-        private byte hospitalId;
+        private Long hospitalId;
     }
 
     @Data
-    @ApiModel("添加rfid")
+    @ApiModel("查询rfid列表")
     public static class QueryRfid{
+        @ApiModelProperty("rfid(十六进制)")
+        private String rfid;
         @ApiModelProperty("类型 0医生 1采血车 2门禁")
-        private byte type;
+        private Byte type;
         @ApiModelProperty("名称")
         private String name;
         @ApiModelProperty("环节")
-        private byte stop;
+        private Long step;
         @ApiModelProperty("医院id")
-        private byte hospitalId;
+        private Long hospitalId;
         @ApiModelProperty("页数")
-        private int pageNum;
+        private int pageNum = 1;
         @ApiModelProperty("每页数量")
-        private int pageSize;
+        private int pageSize = 10;
+    }
+
+    @Data
+    @ApiModel("查询医院列表")
+    public static class QueryHospital {
+
+    }
+
+    @Data
+    @ApiModel("查询医院列表")
+    public static class QueryStep {
     }
 }

wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/RfidVo.java

@@ -8,21 +8,41 @@ import lombok.Data;
 public class RfidVo {
 
     @Data
-    @ApiModel("添加rfid")
+    @ApiModel("查询rfid")
     public static class QueryRfid{
         @ApiModelProperty("rfid表的id")
         private Long id;
         @ApiModelProperty("rfid")
-        private Long rfid;
+        private String rfid;
         @ApiModelProperty("类型 0医生 1采血车 2门禁")
         private byte type;
         @ApiModelProperty("名称")
         private String name;
         @ApiModelProperty("环节")
-        private byte stop;
+        private Long step;
+        @ApiModelProperty("环节名称")
+        private String stepName;
         @ApiModelProperty("医院id")
-        private byte hospitalId;
+        private Long hospitalId;
+        @ApiModelProperty("医院名称")
+        private String hospitalName;
     }
 
+    @Data
+    @ApiModel("医院列表")
+    public static class HospitalList {
+        @ApiModelProperty("医院id")
+        private Long id;
+        @ApiModelProperty("医院名称")
+        private String hospitalName;
+    }
 
+    @Data
+    @ApiModel("环节列表")
+    public static class StepList {
+        @ApiModelProperty("环节id")
+        private Long id;
+        @ApiModelProperty("环节名称")
+        private String name;
+    }
 }

wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/HospitalDao.java

@@ -2,6 +2,7 @@ package com.ccsens.wisdomcar.persist.dao;
 
 import com.ccsens.wisdomcar.bean.po.Hospital;
 import com.ccsens.wisdomcar.bean.po.HospitalExample;
+import com.ccsens.wisdomcar.bean.vo.RfidVo;
 import com.ccsens.wisdomcar.persist.mapper.HospitalMapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,4 +13,9 @@ import java.util.List;
  */
 public interface HospitalDao extends HospitalMapper {
 
+    /**
+     * 查询医院列表
+     * @return 医院列表
+     */
+    List<RfidVo.HospitalList> queryHospitalList();
 }

wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/RfidDao.java

@@ -0,0 +1,23 @@
+package com.ccsens.wisdomcar.persist.dao;
+
+
+import com.ccsens.wisdomcar.bean.dto.RfidDto;
+import com.ccsens.wisdomcar.bean.vo.RfidVo;
+import com.ccsens.wisdomcar.persist.mapper.RfidMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author AUSU
+ */
+public interface RfidDao extends RfidMapper {
+
+    /**
+     * 查看rfid列表
+     * @param param 参数
+     * @return rfid列表
+     */
+    List<RfidVo.QueryRfid> findAllRfid(RfidDto.QueryRfid param);
+
+}

wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StepDao.java

@@ -1,5 +1,6 @@
 package com.ccsens.wisdomcar.persist.dao;
 
+import com.ccsens.wisdomcar.bean.vo.RfidVo;
 import com.ccsens.wisdomcar.bean.vo.StepVo;
 import com.ccsens.wisdomcar.persist.mapper.StepMapper;
 import org.apache.ibatis.annotations.Param;
@@ -37,4 +38,10 @@ public interface StepDao extends StepMapper {
      * @return 环节信息
      */
     List<StepVo.StepStatus> findStepIsOver(@Param("projectId") Long projectId);
+
+    /**
+     * 查询环节列表
+     * @return 环节列表
+     */
+    List<RfidVo.StepList> queryStepList();
 }

wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IRfidService.java

@@ -4,6 +4,8 @@ import com.ccsens.wisdomcar.bean.dto.RfidDto;
 import com.ccsens.wisdomcar.bean.vo.RfidVo;
 import com.github.pagehelper.PageInfo;
 
+import java.util.List;
+
 /**
  * @author 逗
  */
@@ -15,4 +17,18 @@ public interface IRfidService {
     void updateRfid(RfidDto.UpdateRfid param);
 
     PageInfo<RfidVo.QueryRfid> queryRfid(RfidDto.QueryRfid param);
+
+    /**
+     * 查询医院列表
+     * @param param 无
+     * @return 医院列表
+     */
+    List<RfidVo.HospitalList> queryHospitalList(RfidDto.QueryHospital param);
+
+    /**
+     * 查询环节列表
+     * @param param 无
+     * @return 环节列表
+     */
+    List<RfidVo.StepList> queryStepList(RfidDto.QueryStep param);
 }

wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RfidService.java

@@ -1,13 +1,25 @@
 package com.ccsens.wisdomcar.service;
 
+import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.ccsens.util.WebConstant;
 import com.ccsens.wisdomcar.bean.dto.RfidDto;
+import com.ccsens.wisdomcar.bean.po.Rfid;
 import com.ccsens.wisdomcar.bean.vo.RfidVo;
+import com.ccsens.wisdomcar.persist.dao.HospitalDao;
+import com.ccsens.wisdomcar.persist.dao.RfidDao;
+import com.ccsens.wisdomcar.persist.dao.StepDao;
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * @author 逗
  */
@@ -15,23 +27,74 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 public class RfidService implements IRfidService{
+
+    @Resource
+    private RfidDao rfidDao;
+    @Resource
+    private Snowflake snowflake;
+    @Resource
+    private HospitalDao hospitalDao;
+    @Resource
+    private StepDao stepDao;
+
     @Override
     public void saveRfid(RfidDto.SaveRfid param) {
-
+        Rfid rfid = new Rfid();
+        rfid.setId(snowflake.nextId());
+        if (ObjectUtil.isNotNull(param.getStep())){
+            rfid.setStepId(param.getStep());
+        }
+        rfid.setRfid(param.getRfid());
+        rfid.setName(param.getName());
+        rfid.setType(param.getType());
+        rfid.setHospitalId(param.getHospitalId());
+        rfidDao.insertSelective(rfid);
     }
 
     @Override
     public void delRfid(RfidDto.DelRfid param) {
-
+        Rfid rfid = new Rfid();
+        rfid.setId(param.getId());
+        rfid.setRecStatus(WebConstant.REC_STATUS.Deleted.value);
+        rfidDao.updateByPrimaryKeySelective(rfid);
     }
 
     @Override
     public void updateRfid(RfidDto.UpdateRfid param) {
-
+        Rfid rfid = new Rfid();
+        rfid.setId(param.getId());
+        if (StrUtil.isNotBlank(param.getRfid())){
+            rfid.setRfid(param.getRfid());
+        }
+        if (StrUtil.isNotBlank(param.getName())){
+            rfid.setName(param.getName());
+        }
+        if (ObjectUtil.isNotNull(param.getType())){
+            rfid.setType(param.getType());
+        }
+        if (ObjectUtil.isNotNull(param.getStep())){
+            rfid.setStepId(param.getStep());
+        }
+        if (ObjectUtil.isNotNull(param.getHospitalId())){
+            rfid.setHospitalId(param.getHospitalId());
+        }
+        rfidDao.updateByPrimaryKeySelective(rfid);
     }
 
     @Override
     public PageInfo<RfidVo.QueryRfid> queryRfid(RfidDto.QueryRfid param) {
-        return null;
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+        List<RfidVo.QueryRfid> allRfid = rfidDao.findAllRfid(param);
+        return new PageInfo<>(allRfid);
+    }
+
+    @Override
+    public List<RfidVo.HospitalList> queryHospitalList(RfidDto.QueryHospital param) {
+        return hospitalDao.queryHospitalList();
+    }
+
+    @Override
+    public List<RfidVo.StepList> queryStepList(RfidDto.QueryStep param) {
+        return stepDao.queryStepList();
     }
 }

wisdomcar/src/main/resources/mapper_dao/HospitalDao.xml

@@ -2,4 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ccsens.wisdomcar.persist.dao.HospitalDao">
 
+    <select id="queryHospitalList" resultType="com.ccsens.wisdomcar.bean.vo.RfidVo$HospitalList">
+        SELECT
+            id,
+            hospital_name AS hospitalName
+        FROM
+            t_hospital
+        WHERE
+            rec_status = 0
+    </select>
 </mapper>

wisdomcar/src/main/resources/mapper_dao/RfidDao.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ccsens.wisdomcar.persist.dao.RfidDao">
+
+
+    <select id="findAllRfid" resultType="com.ccsens.wisdomcar.bean.vo.RfidVo$QueryRfid">
+        SELECT
+            tr.id AS id,
+            tr.rfid AS rfid,
+            tr.type AS type,
+            tr. NAME AS `name`,
+            tr.step_id AS step,
+            ts.`name` AS stepName,
+            tr.hospital_id AS hospitalId,
+            th.hospital_name AS hospitalName
+        FROM
+            t_rfid AS tr
+        LEFT JOIN t_step AS ts ON ts.id = tr.step_id
+        AND ts.rec_status = 0
+        LEFT JOIN t_hospital th ON th.id = tr.hospital_id
+        AND th.rec_status = 0
+        WHERE
+            tr.rec_status = 0
+        <if test="rfid != null and rfid != ''">
+            AND tr.rfid like concat('%',conv(#{rfid}, 16, 10 ),'%')
+        </if>
+        <if test="name != null and name != ''">
+            AND tr.`name` like concat('%',#{name},'%')
+        </if>
+        <if test="type != null and type != '' or type == 0">
+            AND tr.type = #{type}
+        </if>
+        <if test="step != null and step != ''">
+            AND tr.step_id = #{step}
+        </if>
+        <if test="hospitalId != null and hospitalId != ''">
+            AND tr.hospital_id = #{hospitalId}
+        </if>
+    </select>
+
+</mapper>

wisdomcar/src/main/resources/mapper_dao/StepDao.xml

@@ -66,5 +66,16 @@
 			s.`code` + 1
 	</select>
 
+    <select id="queryStepList" resultType="com.ccsens.wisdomcar.bean.vo.RfidVo$StepList">
+		SELECT
+			id,
+			`name`
+		FROM
+			t_step
+		WHERE
+			rec_status = 0
+		AND step_type = 0
+	</select>
+
 
 </mapper>