药剂、安全管理

src/main/java/com/chinaitop/depot/business/mapper/BusinessDrugStandingBookMapper.java

@@ -62,4 +62,6 @@ public interface BusinessDrugStandingBookMapper {
 
 	List<Map<String, Object>> getAllDataList(Map<String, Object> map);
 
+	Map<String, Object> getYjGjjDate(Integer id);
+
 }

src/main/java/com/chinaitop/depot/business/mapper/BusinessDrugStandingBookMapper.xml

@@ -121,7 +121,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.chinaitop.depot.business.model.BusinessDrugStandingBook" >
+  <insert id="insert" parameterType="com.chinaitop.depot.business.model.BusinessDrugStandingBook" useGeneratedKeys="true" keyProperty="id">
     insert into business_drug_standing_book (id, type, drug_info_id,
       drug_number, drug_kind, drug_name, 
       drug_type, drug_packing, drug_specification, 
@@ -139,7 +139,7 @@
       #{isLastShelfData,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{orgId,jdbcType=INTEGER}, 
       #{drugRestoreId,jdbcType=INTEGER}, #{updatetime,jdbcType=TIMESTAMP}, #{drugSpecificationUnit,jdbcType=INTEGER})
   </insert>
-  <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessDrugStandingBook" >
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessDrugStandingBook" useGeneratedKeys="true" keyProperty="id">
     insert into business_drug_standing_book
     <trim prefix="(" suffix=")" suffixOverrides="," >
         id,
@@ -928,4 +928,45 @@ select
 		ORDER by drugkind
   </select>
   
+  <select id="getYjGjjDate" parameterType="java.lang.Integer" resultType="java.util.Map">
+  		select
+		d.drug_number id,
+		a.id sj_id,
+		b.kqbm||'0'||substr(d.drug_number, length(d.drug_number)-1, 2) yjbh	,
+		b.kqbm kqdm	,
+		b.tykqbm tykqbm,
+		b.credit_code dwdm	,
+		b.org_name kqmc	,
+		e1.enumname yjmc	,
+		case d.drug_packing when '5509' then '1' when '5511' then '2' else '3' end bzw	   , 
+		d.drug_specification||(case d.drug_unit when '5505' then 'L' when '5507' then 'kg' end) ggxh	,
+		d.aqsysms aqsysms, 
+		a.manufacturer sccj	,
+		c.cgly cgly	,
+		d.cctj cctj	,
+		d.ccdd ccdd	,
+		d.bzwclfs bzwclfs, 
+		d.syhclfs czclfs	,
+		TIMESTAMPDIFF(DAY, DATE_FORMAT(c.production_date,'%Y-%m-%d'), DATE_FORMAT(c.expire_date,'%Y-%m-%d')) AS bzq, 
+		DATE_FORMAT(c.create_time,'%Y-%m-%d') cgrq	,
+		case a.drug_specification_unit when '5505' then CAST(a.amount AS DECIMAL(20,3))*1000 else CAST(a.amount AS DECIMAL) end kcsl,
+		case a.drug_specification_unit when '5505' then '3' else '1' end kcsldw,  
+		DATE_FORMAT(a.updatetime, '%Y-%m-%d %H:%i:%s') zhgxsj   
+		from business_drug_standing_book a
+		left join org_info b on b.org_id=a.org_id
+		left join business_drug_info d on d.id=a.drug_info_id
+		left join (
+		  select * from (
+		    select 
+		      id drug_storage_id, drug_info_id, manufacturer, 
+		      row_number() over(partition by drug_info_id, manufacturer order by id desc) nums 
+		    from business_drug_storage where 1=1
+		  )  s
+		  where s.nums=1
+		) f on f.drug_info_id=a.drug_info_id and f.manufacturer=a.manufacturer
+		left join business_drug_storage c on c.id=f.drug_storage_id
+		left join basic_enum e1 on e1.enumid=d.drug_name
+		where a.is_last_shelf_data=1 and a.amount>0 and a.id = #{id};
+
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/business/service/impl/BusinessDrugStandingBookServiceImpl.java

@@ -4,12 +4,19 @@ import com.chinaitop.depot.business.mapper.BusinessDrugStandingBookMapper;
 import com.chinaitop.depot.business.model.*;
 import com.chinaitop.depot.business.service.BusinessDrugStandingBookService;
 import com.chinaitop.depot.utils.ParameterUtil;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -35,6 +42,14 @@ public class BusinessDrugStandingBookServiceImpl implements BusinessDrugStanding
 
     @Autowired
     private BusinessDrugStandingBookMapper drugStandingBookMapper;
+    
+    @Resource
+    private RestTemplate restTemplate;
+
+    @Bean
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
 
     /**
      * 入库新增台账数据.
@@ -94,6 +109,7 @@ public class BusinessDrugStandingBookServiceImpl implements BusinessDrugStanding
             drugStandingBookBefore.setIsLastShelfData(0);
             drugStandingBookBefore.setUpdatetime(new Date());
             drugStandingBookMapper.updateByPrimaryKeySelective(drugStandingBookBefore);
+            this.gjjjk(drugStandingBook.getId(), drugStandingBook.getOrgId(), "u");
         } else {
             // 第一次，两个台账数量都等于入库数量.
             String new_amount = amount(amount, drugStorage.getStorageCount(), SCALE_ADD);//入库后的最新台账数量
@@ -103,6 +119,8 @@ public class BusinessDrugStandingBookServiceImpl implements BusinessDrugStanding
         // 新增.
         drugStandingBook.setUpdatetime(new Date());
         drugStandingBookMapper.insert(drugStandingBook);
+        
+        this.gjjjk(drugStandingBook.getId(), drugStandingBook.getOrgId(), "i");
     }
 
     @Override
@@ -171,6 +189,7 @@ public class BusinessDrugStandingBookServiceImpl implements BusinessDrugStanding
             drugStandingBookBefore.setIsLastShelfData(0);
             drugStandingBookBefore.setUpdatetime(new Date());
             drugStandingBookMapper.updateByPrimaryKeySelective(drugStandingBookBefore);
+            this.gjjjk(drugStandingBook.getId(), drugStandingBook.getOrgId(), "u");
         } else {
             // 第一次.
             throw new RuntimeException("没有对应的数据可以出库!");
@@ -178,6 +197,7 @@ public class BusinessDrugStandingBookServiceImpl implements BusinessDrugStanding
         // 新增.
         drugStandingBook.setUpdatetime(new Date());
         drugStandingBookMapper.insert(drugStandingBook);
+        this.gjjjk(drugStandingBook.getId(), drugStandingBook.getOrgId(), "i");
     }
 
     private String amount(String y_num, String rk_num, String type) {
@@ -322,6 +342,7 @@ public class BusinessDrugStandingBookServiceImpl implements BusinessDrugStanding
                     drugStandingBookBefore.setIsLastShelfData(0);
                     drugStandingBookBefore.setUpdatetime(new Date());
                     drugStandingBookMapper.updateByPrimaryKeySelective(drugStandingBookBefore);
+                    this.gjjjk(drugStandingBook.getId(), drugStandingBook.getOrgId(), "u");
                 }
 
             } else if (Double.parseDouble(checkCount) < Double.parseDouble(shelfAmount)) {
@@ -343,6 +364,7 @@ public class BusinessDrugStandingBookServiceImpl implements BusinessDrugStanding
                     drugStandingBookBefore.setIsLastShelfData(0);
                     drugStandingBookBefore.setUpdatetime(new Date());
                     drugStandingBookMapper.updateByPrimaryKeySelective(drugStandingBookBefore);
+                    this.gjjjk(drugStandingBook.getId(), drugStandingBook.getOrgId(), "u");
                 } else {
                     // 第一次.
                     throw new RuntimeException("没有对应的数据可以出库!");
@@ -354,6 +376,7 @@ public class BusinessDrugStandingBookServiceImpl implements BusinessDrugStanding
             // 新增台账.
             drugStandingBook.setUpdatetime(new Date());
             drugStandingBookMapper.insert(drugStandingBook);
+            this.gjjjk(drugStandingBook.getId(), drugStandingBook.getOrgId(), "i");
         }
     }
 
@@ -436,6 +459,7 @@ public class BusinessDrugStandingBookServiceImpl implements BusinessDrugStanding
             drugStandingBookBefore.setIsLastShelfData(0);
             drugStandingBookBefore.setUpdatetime(new Date());
             drugStandingBookMapper.updateByPrimaryKeySelective(drugStandingBookBefore);
+            this.gjjjk(drugStandingBook.getId(), drugStandingBook.getOrgId(), "u");
         } else {
             // 第一次.
             throw new RuntimeException("没有对应的数据可以归还!");
@@ -443,6 +467,7 @@ public class BusinessDrugStandingBookServiceImpl implements BusinessDrugStanding
         // 新增
         drugStandingBook.setUpdatetime(new Date());
         drugStandingBookMapper.insertSelective(drugStandingBook);
+        this.gjjjk(drugStandingBook.getId(), drugStandingBook.getOrgId(), "i");
     }
 
     /**
@@ -503,10 +528,14 @@ public class BusinessDrugStandingBookServiceImpl implements BusinessDrugStanding
             standingBookOld.setIsLastShelfData(0);
             standingBookOld.setUpdatetime(new Date());
             drugStandingBookMapper.updateByPrimaryKeySelective(standingBookOld);
+            this.gjjjk(drugStandingBook.getId(), drugStandingBook.getOrgId(), "u");
+
 
             // 新增.
             drugStandingBook.setUpdatetime(new Date());
             drugStandingBookMapper.insert(drugStandingBook);
+            this.gjjjk(drugStandingBook.getId(), drugStandingBook.getOrgId(), "i");
+
         } else {
             throw new IllegalArgumentException("没有相应的数据!");
         }
@@ -682,5 +711,38 @@ public class BusinessDrugStandingBookServiceImpl implements BusinessDrugStanding
 		
 		return list;
 	}
+	
+	
+	/**
+	 * 国家局数据
+	 */
+    public void gjjjk(Integer id, Integer orgId,String czbz) {
+        
+		Map<String, Object>  gjjMap = drugStandingBookMapper.getYjGjjDate(id);
+		gjjMap.put("czbz",czbz);
+		gjjMap.put("is_upload", 0);
+		String tableName = "ODS_UP_YJXXJK";
+		
+		/**
+         * restTemplate调用
+         */
+        String url = "http://localhost:9022/recPublish/sendMessage";//
+        // 发送post请求，并打印结果，以String类型接收响应结果JSON字符串
+        MultiValueMap<String, Object> sendMap = new LinkedMultiValueMap<>();
+		//Map<String, Object>  sendMap = new HashMap<String, Object>();
+        ObjectMapper objectMapper = new ObjectMapper();
+        String jsonMap;
+        try {
+			 jsonMap = objectMapper.writeValueAsString(gjjMap);
+			 sendMap.add("gjjMapJson",jsonMap);
+		} catch (JsonProcessingException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		sendMap.add("tableName", tableName);
+		sendMap.add("orgId",orgId);
+
+       String result = (String) restTemplate.postForObject(url, sendMap, String.class);
+    }
 
 }

src/main/java/com/chinaitop/depot/risk/mapper/StorageSafeManageMapper.java

@@ -43,4 +43,6 @@ public interface StorageSafeManageMapper {
      * @return
      */
     Map<String, Object> getBasicEnumObj(Integer enumid);
+
+	Map<String, Object> getAqglGjjDate(Integer id);
 }

src/main/java/com/chinaitop/depot/risk/mapper/StorageSafeManageMapper.xml

@@ -628,4 +628,43 @@
     select enumid,enumcode,gbcode,enumname from basic_enum
     where enumid = #{enumid,jdbcType=INTEGER}
   </select>
+  
+  <select id="getAqglGjjDate" parameterType="java.lang.Integer" resultType="java.util.Map">
+  		
+	select 
+	a.id id,
+	b.kqbm kqdm,
+	b.tykqbm tykqbm,
+	dw.dwdm dwdm,
+	e3.enumname || e4.enumname || e5.enumname || a.address dd,
+	a.fxdbm,
+	a.sbr,
+	a.hjbw,
+	TRIM(BOTH ' ' FROM REPLACE(REPLACE(a.fxxx, CHAR(13), ''), CHAR(10), '')) fxxx,
+	e1.gbcode fxlx,
+	e2.gbcode fxfj,
+	a.fxglcs,
+	TRIM(BOTH ' ' FROM REPLACE(REPLACE(a.yhxx, CHAR(13), ''), CHAR(10), '')) yhxx,
+	a.yhpcxx,
+	a.yhzgxx,
+	a.yhysxx,
+	a.sgjbxx,
+	a.zgsx,
+	a.zrdw,
+	a.zrr,
+	a.zgysxx,
+	a.fxgzjgzrr,
+	a.czbz,
+	a.zhgxsj
+	from storage_safe_manage a 
+	left join org_info b on b.org_id=a.org_id
+	left join basic_enum e1 on e1.enumid=a.fxlx
+	left join basic_enum e2 on e2.enumid=a.fxfj
+	left join basic_enum e3 on e3.enumid=b.zc_province
+	left join basic_enum e4 on e4.enumid=b.zc_city
+	left join basic_enum e5 on e5.enumid=b.zc_county
+	left join province_all.biz_unit_info dw on dw.id = b.unit_info_id
+	where 1=1 and a.id = #{id};
+
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/risk/mapper/ViolationWarningAlarmMapper.java

@@ -1,6 +1,5 @@
 package com.chinaitop.depot.risk.mapper;
 
-import com.chinaitop.depot.risk.model.RiskManagement;
 import com.chinaitop.depot.risk.model.ViolationWarningAlarm;
 
 
@@ -19,4 +18,6 @@ public interface ViolationWarningAlarmMapper {
     ViolationWarningAlarm selectById(Integer id);
 
     void updateById(ViolationWarningAlarm riskManagement);
+
+	Map<String, Object> getWgyjGjjDate(Integer id);
 }

src/main/java/com/chinaitop/depot/risk/mapper/ViolationWarningAlarmMapper.xml

@@ -127,5 +127,30 @@
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
+    
+    
+    <select id="getWgyjGjjDate" parameterType="java.lang.Integer" resultType="java.util.Map">
+        
+		select 
+		a.id id,
+		CONCAT(org.kqbm,DATE_FORMAT(a.publish_time, '%Y%m%d'),case LENGTH(id) when '1' then CONCAT(00,id) when '2' then CONCAT(0,id) when '3' then id else SUBSTRING(id,LENGTH(id)-2,LENGTH(id)) end) yjxxdm,
+		DATE_FORMAT(a.publish_time, '%Y-%m-%d %H:%i:%s') fbsj,  
+		'01' wgztlx,
+		substr(org.kqbm, 1,18) qydm,  
+		org.tykqbm wgdwtybm,
+		offender wgxwr, 
+		org.org_name sjkd,  
+		'03' wglx,  
+		REPLACE(REPLACE(REPLACE(a.detail, char(10), ''), char(13), ''), ' ', '') wgqk,  
+		case a.status when '0' then '01' else '02' end czzt,  
+		a.dispose_content hxczqk,
+		a.disposer hxczr, 
+		DATE_FORMAT(a.dispose_time, '%Y-%m-%d %H:%i:%s') hxczsj,  
+		a.create_time zhgxsj 
+		from storage_pre_violation a
+		left join org_info org on org.org_id=a.org_id
+		where a.id = #{id};
+
+    </select>
 
 </mapper>

src/main/java/com/chinaitop/depot/risk/service/impl/StorageSafeManageServiceImpl.java

@@ -6,7 +6,14 @@ import com.chinaitop.depot.risk.model.StorageSafeManageExample;
 import com.chinaitop.depot.risk.model.StorageSafeManageWithBLOBs;
 import com.chinaitop.depot.risk.service.StorageSafeManageService;
 import com.chinaitop.depot.utils.ParameterUtil;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -20,6 +27,14 @@ public class StorageSafeManageServiceImpl implements StorageSafeManageService {
     
     @Resource
     private BasicFeignClient basicFeignClient;
+    
+    @Resource
+    private RestTemplate restTemplate;
+
+    @Bean
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
 
     @Override
     public List<StorageSafeManageWithBLOBs> findbyConditions(Integer orgId, Integer fxlx, Integer fxfj) throws Exception {
@@ -63,6 +78,8 @@ public class StorageSafeManageServiceImpl implements StorageSafeManageService {
             //附件
             basicFeignClient.updateFile(fileIds, storageSafeManage.getId(),"safeManage");
             
+            this.gjjjk(storageSafeManage.getId(), storageSafeManage.getOrgId(), "u");
+            
         } else {
         	//新增
             //String uuid = UUID.randomUUID().toString().replace("-", "");
@@ -79,6 +96,7 @@ public class StorageSafeManageServiceImpl implements StorageSafeManageService {
             storageSafeManageMapper.insert(storageSafeManage);
             //附件
             basicFeignClient.updateFile(fileIds, id,"safeManage");
+            this.gjjjk(id, storageSafeManage.getOrgId(), "i");
         }
        
     }
@@ -86,6 +104,8 @@ public class StorageSafeManageServiceImpl implements StorageSafeManageService {
     @Override
     public void deleteById(String id) throws Exception {
         storageSafeManageMapper.deleteByPrimaryKey(id);
+        this.gjjjk(Integer.valueOf(id), Integer.valueOf(id), "d");
+
     }
 
     /**
@@ -111,4 +131,36 @@ public class StorageSafeManageServiceImpl implements StorageSafeManageService {
 
         return fxdbm;
     }
+    
+    /**
+   	 * 国家局数据
+   	 */
+       public void gjjjk(Integer id, Integer orgId,String czbz) {
+           
+   		Map<String, Object>  gjjMap = storageSafeManageMapper.getAqglGjjDate(id);
+   		gjjMap.put("czbz",czbz);
+   		gjjMap.put("is_upload", 0);
+   		String tableName = "ODS_UP_AQGLXXJK";
+   		
+   		/**
+            * restTemplate调用
+            */
+           String url = "http://localhost:9022/recPublish/sendMessage";//
+           // 发送post请求，并打印结果，以String类型接收响应结果JSON字符串
+           MultiValueMap<String, Object> sendMap = new LinkedMultiValueMap<>();
+   		//Map<String, Object>  sendMap = new HashMap<String, Object>();
+           ObjectMapper objectMapper = new ObjectMapper();
+           String jsonMap;
+           try {
+   			 jsonMap = objectMapper.writeValueAsString(gjjMap);
+   			 sendMap.add("gjjMapJson",jsonMap);
+   		} catch (JsonProcessingException e) {
+   			// TODO Auto-generated catch block
+   			e.printStackTrace();
+   		}
+   		sendMap.add("tableName", tableName);
+   		sendMap.add("orgId",orgId);
+
+          String result = (String) restTemplate.postForObject(url, sendMap, String.class);
+       }
 }

src/main/java/com/chinaitop/depot/risk/service/impl/ViolationWarningAlarmServiceImpl.java

@@ -3,12 +3,22 @@ package com.chinaitop.depot.risk.service.impl;
 import com.chinaitop.depot.risk.mapper.ViolationWarningAlarmMapper;
 import com.chinaitop.depot.risk.model.ViolationWarningAlarm;
 import com.chinaitop.depot.risk.service.ViolationWarningAlarmService;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import lombok.RequiredArgsConstructor;
+
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
 
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Resource;
+
 /**
  * class
  *
@@ -20,6 +30,15 @@ import java.util.Map;
 public class ViolationWarningAlarmServiceImpl implements ViolationWarningAlarmService {
 
     private final ViolationWarningAlarmMapper violationWarningAlarmMapper;
+    
+    @Resource
+    private RestTemplate restTemplate;
+
+    @Bean
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
+    
     @Override
     public List<ViolationWarningAlarm> selectListPage(Map<String, Object> queryMap) {
         return  violationWarningAlarmMapper.selectListPage(queryMap);
@@ -33,5 +52,40 @@ public class ViolationWarningAlarmServiceImpl implements ViolationWarningAlarmSe
     @Override
     public void updateDate(ViolationWarningAlarm violationWarningAlarm) {
         violationWarningAlarmMapper.updateById(violationWarningAlarm);
+        this.gjjjk(violationWarningAlarm.getId(), violationWarningAlarm.getOrgId(), "u");
+        
     }
+    
+    
+    /**
+   	 * 国家局数据
+   	 */
+       public void gjjjk(Integer id, Integer orgId,String czbz) {
+           
+   		Map<String, Object>  gjjMap = violationWarningAlarmMapper.getWgyjGjjDate(id);
+   		gjjMap.put("czbz",czbz);
+   		gjjMap.put("is_upload", 0);
+   		String tableName = "ODS_UP_WGYJXXJK";
+   		
+   		/**
+            * restTemplate调用
+            */
+           String url = "http://localhost:9022/recPublish/sendMessage";//
+           // 发送post请求，并打印结果，以String类型接收响应结果JSON字符串
+           MultiValueMap<String, Object> sendMap = new LinkedMultiValueMap<>();
+   		//Map<String, Object>  sendMap = new HashMap<String, Object>();
+           ObjectMapper objectMapper = new ObjectMapper();
+           String jsonMap;
+           try {
+   			 jsonMap = objectMapper.writeValueAsString(gjjMap);
+   			 sendMap.add("gjjMapJson",jsonMap);
+   		} catch (JsonProcessingException e) {
+   			// TODO Auto-generated catch block
+   			e.printStackTrace();
+   		}
+   		sendMap.add("tableName", tableName);
+   		sendMap.add("orgId",orgId);
+
+          String result = (String) restTemplate.postForObject(url, sendMap, String.class);
+       }
 }