国家局接口

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

@@ -62,6 +62,5 @@ 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

@@ -928,45 +928,5 @@ 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

@@ -718,31 +718,20 @@ public class BusinessDrugStandingBookServiceImpl implements BusinessDrugStanding
 	 */
     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";
-		
+       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();
-		}
+        * restTemplate调用
+        */
+       //String url = "http://localhost:9022/recPublish/sendMessage";//
+       //发送post请求，并打印结果，以String类型接收响应结果JSON字符串
+		
+       MultiValueMap<String, Object> sendMap = new LinkedMultiValueMap<>();
 		sendMap.add("tableName", tableName);
-		sendMap.add("orgId",orgId);
+		sendMap.add("czbz", czbz);
+		sendMap.add("ywId", id);
+		sendMap.add("orgId", orgId);
 
-       String result = (String) restTemplate.postForObject(jsgjjsjUrl, sendMap, String.class);
+       restTemplate.postForObject(jsgjjsjUrl, sendMap, String.class);
     }
 
 }

src/main/java/com/chinaitop/depot/risk/controller/StorageSafeManageController.java

@@ -125,12 +125,12 @@ public class StorageSafeManageController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键唯一ID", paramType = "form")
     })
-    public Map<String, String> remove(String id) {
+    public Map<String, String> remove(String id,Integer orgId) {
 
         Map<String, String> map = new HashMap<>();
 
         try {
-            storageSafeManageService.deleteById(id);
+            storageSafeManageService.deleteById(id,orgId);
             map.put("msg", "操作成功！");
             map.put("status", "200");
         } catch (Exception e) {

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

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

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

@@ -629,42 +629,4 @@
     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

@@ -19,5 +19,4 @@ public interface ViolationWarningAlarmMapper {
 
     void updateById(ViolationWarningAlarm riskManagement);
 
-	Map<String, Object> getWgyjGjjDate(Integer id);
 }

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

@@ -128,29 +128,4 @@
         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/StorageSafeManageService.java

@@ -38,5 +38,5 @@ public interface StorageSafeManageService {
      * @param id 主键唯一ID
      * @throws Exception
      */
-    void deleteById(String id) throws Exception;
+    void deleteById(String id,Integer orgId) throws Exception;
 }

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

@@ -77,7 +77,7 @@ public class StorageSafeManageServiceImpl implements StorageSafeManageService {
             //附件
             basicFeignClient.updateFile(fileIds, storageSafeManage.getId(),"safeManage");
             
-            this.gjjjk(storageSafeManage.getId(), storageSafeManage.getOrgId(), "u");
+            this.gjjjk(storageSafeManage.getId()+"", storageSafeManage.getOrgId(), "u");
             
         } else {
         	//新增
@@ -95,15 +95,15 @@ public class StorageSafeManageServiceImpl implements StorageSafeManageService {
             storageSafeManageMapper.insert(storageSafeManage);
             //附件
             basicFeignClient.updateFile(fileIds, id,"safeManage");
-            this.gjjjk(id, storageSafeManage.getOrgId(), "i");
+            this.gjjjk(id+"", storageSafeManage.getOrgId(), "i");
         }
        
     }
 
     @Override
-    public void deleteById(String id) throws Exception {
+    public void deleteById(String id,Integer orgId) throws Exception {
         storageSafeManageMapper.deleteByPrimaryKey(id);
-        this.gjjjk(Integer.valueOf(id), Integer.valueOf(id), "d");
+        this.gjjjk(id, orgId, "d");
 
     }
 
@@ -134,32 +134,21 @@ public class StorageSafeManageServiceImpl implements StorageSafeManageService {
     /**
    	 * 国家局数据
    	 */
-       public void gjjjk(Integer id, Integer orgId,String czbz) {
+       public void gjjjk(String 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(jsgjjsjUrl, sendMap, String.class);
+         String tableName = "ODS_UP_AQGLXXJK";
+  		/**
+           * restTemplate调用
+           */
+          //String url = "http://localhost:9022/recPublish/sendMessage";//
+          //发送post请求，并打印结果，以String类型接收响应结果JSON字符串
+  		
+        MultiValueMap<String, Object> sendMap = new LinkedMultiValueMap<>();
+  		sendMap.add("tableName", tableName);
+  		sendMap.add("czbz", czbz);
+  		sendMap.add("ywId", id);
+  		sendMap.add("orgId", orgId);
+
+          restTemplate.postForObject(jsgjjsjUrl, sendMap, String.class);
        }
 }

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

@@ -3,12 +3,10 @@ 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.beans.factory.annotation.Value;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
@@ -35,10 +33,8 @@ public class ViolationWarningAlarmServiceImpl implements ViolationWarningAlarmSe
     @Resource
     private RestTemplate restTemplate;
 
-    @Bean
-    public RestTemplate restTemplate() {
-        return new RestTemplate();
-    }
+    @Value("${jsgjjsjUrl}")
+    private String jsgjjsjUrl;
     
     @Override
     public List<ViolationWarningAlarm> selectListPage(Map<String, Object> queryMap) {
@@ -69,31 +65,22 @@ public class ViolationWarningAlarmServiceImpl implements ViolationWarningAlarmSe
    	 * 国家局数据
    	 */
        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";
-   		
+        
+    	   
+    	 String tableName = "ODS_UP_WGYJXXJK";
    		/**
             * restTemplate调用
             */
-           String url = "http://localhost:9022/recPublish/sendMessage";//
-           // 发送post请求，并打印结果，以String类型接收响应结果JSON字符串
+           //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);
+   		sendMap.add("czbz", czbz);
+   		sendMap.add("ywId", id);
+   		sendMap.add("orgId", orgId);
 
-          String result = (String) restTemplate.postForObject(url, sendMap, String.class);
+        restTemplate.postForObject(jsgjjsjUrl, sendMap, String.class);
+           
        }
 }