m

youxiw2000
1 parent b8e0b2a1
Showing 8 changed files with 46 additions and 24 deletions
trash-admin/src/main/resources/application-dev.yml
trash-garbage/pom.xml
trash-garbage/src/main/java/com/trash/garbage/interceptor/MyMetaObjectHandler.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderEvaluate.java
trash-garbage/src/main/java/com/trash/garbage/utils/QRCodeUtil.java
trash-workFlow/pom.xml
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckActivateServiceImpl.java
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
@@ -19,6 +19,7 @@ trash:
     # 远程服务器地址
     #remotePath: http://175.6.47.84:8008
     #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
+    #remotePath: http://cszhatu.natapp1.cc
     remotePath: http://183.66.242.6:14601
     token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
@@ -16,10 +16,10 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
-<!--        <dependency>-->
-<!--            <groupId>com.trash</groupId>-->
-<!--            <artifactId>trash-common</artifactId>-->
-<!--        </dependency>-->
+       <dependency>
+            <groupId>com.trash</groupId>
+           <artifactId>trash-common</artifactId>
+       </dependency>
         <!--二维码扫描工具包-->
@@ -26,7 +26,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
             try {
                 this.strictInsertFill(metaObject, "garCreateBy", String.class, SecurityUtils.getLoginUser().getUser().getUserId());
             }catch (Exception e) {
-                log.info("当前操作定时任务");
+            	e.printStackTrace();
             }
         }
         if (metaObject.hasGetter("garUpdateTime")) {
@@ -36,7 +36,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
             try {
                 this.strictInsertFill(metaObject, "garUpdateBy", String.class, SecurityUtils.getLoginUser().getUser().getUserId());
             }catch (Exception e) {
-                log.info("当前操作定时任务");
+            	e.printStackTrace();
             }
         }
     }
@@ -50,7 +50,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
             try {
                 this.strictUpdateFill(metaObject, "garUpdateBy", String.class, SecurityUtils.getLoginUser().getUser().getUserId());
             }catch (Exception e) {
-                log.info("当前操作定时任务");
+            	e.printStackTrace();
             }
         }
     }
@@ -171,6 +171,16 @@ public class GarOrderEvaluate implements Serializable {
 		this.garRemark = garRemark;
 	}
+	
+	
+	public Integer getCountTheNumber() {
+		return countTheNumber;
+	}
+
+	public void setCountTheNumber(Integer countTheNumber) {
+		this.countTheNumber = countTheNumber;
+	}
+
 	public static long getSerialversionuid() {
 		return serialVersionUID;
 	}
 package com.trash.garbage.utils;
+import com.google.gson.Gson;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.EncodeHintType;
 import com.google.zxing.WriterException;
@@ -14,7 +15,7 @@ import java.io.IOException;
 import java.util.HashMap;
 public class QRCodeUtil {
-
+	
     /**
      * 生成指定网址大小及图片格式的二维码
      *
@@ -23,7 +24,6 @@ public class QRCodeUtil {
      */
     public static BufferedImage createQRCode(String url, int size)
             throws WriterException, IOException {
-
         HashMap<EncodeHintType, Object> hintMap = new HashMap<EncodeHintType, Object>();
         hintMap.put(EncodeHintType.CHARACTER_SET, "UTF-8");
@@ -29,6 +29,5 @@
             <version>1.1.1.RELEASE</version>
         </dependency>
-
     </dependencies>
 </project>
 \ No newline at end of file
@@ -595,23 +595,20 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
 		}
 		List list = truckActivateMapper.getTruckHistoryListByObjects(truckActivate);
-
+		
 		Gson gson = new Gson();
 		String json = gson.toJson(list);
-		List<Map> data = gson.fromJson(json, new TypeToken<List<Map>>() {
-		}.getType());
+		List<Map> data = gson.fromJson(json, new TypeToken<List<Map>>() {}.getType());
 		for (Map map : data) {
 			if (map.get("routeInfo") != null) {
-				map.put("routeInfo", gson.fromJson(map.get("routeInfo").toString(), new TypeToken<List<Map>>() {
-				}.getType()));
+				map.put("routeInfo", gson.fromJson(map.get("routeInfo").toString(), new TypeToken<List<Map>>() {}.getType()));
 			}
 			if (map.get("earthList") != null) {
-				map.put("earthList", gson.fromJson(map.get("earthList").toString(), new TypeToken<List<Map>>() {
-				}.getType()));
+				map.put("earthList", gson.fromJson(map.get("earthList").toString(), new TypeToken<List<Map>>() {}.getType()));
 			}
 		}
@@ -88,6 +88,9 @@ public class WorkflowServiceImpl implements IWorkflowService {
 	String outArea = "株洲市,湘潭市,汨罗市,湘阴县";
+	String tcdOutArea = "长沙县,望城区,浏阳市,宁乡市"; //车企人外区
+	   
+	
 	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -125,16 +128,28 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		JSONArray areas = RemoteServerUtils.getAreas();
 		if (map.get("area") != null){
 			areaCode = map.get("area").toString();
-			for(Object obj : areas){
-				JSONObject jsonObject = (JSONObject) obj;
-				if(areaCode.equals(jsonObject.getString("code"))){
-					if(outArea.contains(jsonObject.getString("name"))){
-						index = 1;
+			
+			if(flowType.equals("workflow_vehicle") || flowType.equals("workflow_company") || flowType.equals("workflow_driver")){
+				for(Object obj : areas){
+					JSONObject jsonObject = (JSONObject) obj;
+					if(areaCode.equals(jsonObject.getString("code"))){
+						if(tcdOutArea.contains(jsonObject.getString("name"))){
+							index = 1;
+						}
+						break;
+					}
+				}
+			}else{
+				for(Object obj : areas){
+					JSONObject jsonObject = (JSONObject) obj;
+					if(areaCode.equals(jsonObject.getString("code"))){
+						if(outArea.contains(jsonObject.getString("name"))){
+							index = 1;
+						}
+						break;
 					}
-					break;
 				}
 			}
-			
 		}
 		ProcessInstance processInstance = null;