获取服务分类，服务分类区分站点及新增固定token及新增服务确认单删除功能

src/rest/openapi/base/parameter/parameter.java

@@ -16,7 +16,7 @@ public class parameter {
     public static ArrayList<String> tokenlist = new ArrayList<String>(16);
     public static HashMap<String, String> siteidList = new HashMap<>(16);
     public static HashMap<String, String> usertypeList = new HashMap<>(16);
-    public static boolean isdebug = true;
+    public static boolean isdebug = false;
     public static String serverUrl = null;
 
     public static String getAttchDownUrl() {

src/rest/openapi/base/restful/WebClientRest.java

@@ -83,6 +83,7 @@ public class WebClientRest {
          * ÑéÖ¤ÕýÎÄÖеÄtokenÊÇ·ñÓÐЧ
          */
         String accesstoken = requestcontent.getString("accesstoken");
+        parameter.tokenlist.add("87d78312384543ee789dd30ee606ef3f");
         if (!parameter.isdebug && !parameter.tokenlist.contains(accesstoken)) {
             return ErrModel.token_Validate().toString();
         }

src/rest/openapi/restcontroller/hyworkorder/web/afterserviceorder/Afterserviceorder.java

@@ -611,14 +611,16 @@ public class Afterserviceorder extends Controller {
 
     /**获取应用系统**/
     public String get_appsystem(){
+    	if(StringUtils.isBlank(siteid))return getReturnObject_err("siteid为空").toString();
         DBConnect dbConnect=new DBConnect();
-        Rows rows = dbConnect.runSqlQuery("select value from PS_DATABIND_LIST where databindid='APPSYSTEM' order by SEQUENCE");
+        Rows rows = dbConnect.runSqlQuery("select value from PS_DATABIND_LIST where databindid='APPSYSTEM' and siteid='"+siteid+"' order by SEQUENCE");
         return getReturnObject_suc(rows,false).toString();
     }
     /**获取服务分类**/
     public String errcategory(){
+    	if(StringUtils.isBlank(siteid))return getReturnObject_err("siteid为空").toString();
         DBConnect dbConnect=new DBConnect();
-        Rows rows = dbConnect.runSqlQuery("select value from PS_DATABIND_LIST where databindid='ERRCATEGORY' order by SEQUENCE");
+        Rows rows = dbConnect.runSqlQuery("select value from PS_DATABIND_LIST where databindid='ERRCATEGORY' and siteid='"+siteid+"' order by SEQUENCE");
         return getReturnObject_suc(rows,false).toString();
     }
 

src/rest/openapi/restcontroller/hyworkorder/webapp/hyconfirmationorder/MyHyconfirmationorder.java

@@ -13,6 +13,8 @@ import openapi.restcontroller.wechatapp.system.OBSDocManage;
 import openapi.restcontroller.wechatapp.system.docManage;
 import openapi.tools.obs.BucketFile;
 import org.apache.commons.lang.StringUtils;
+
+import afterserviceorder.afterserviceorder;
 import p2.p2server.P2Server;
 import p2.pao.PaoRemote;
 import p2.pao.PaoSetRemote;
@@ -484,6 +486,37 @@ public class MyHyconfirmationorder extends Controller {
 
 
     }
+    
+    /**删除服务确认单**/
+    public String delete(){
+        if(StringUtils.isBlank(hrid))return getReturnObject_err("hrid为空").toString();
+        if(StringUtils.isBlank(fagentnum))return getReturnObject_err("fagentnum为空").toString();
+        if(StringUtils.isBlank(siteid))return getReturnObject_err("siteid为空").toString();
+        JSONObject where = content.getJSONObject("where");
+        String s[] = {"fbillnum"};
+        for (String s1 : s) {
+            if (!where.containsKey(s1))return getReturnObject_err("缺少" + s1 + "参数").toString();
+        }
+        if (where != null) {
+            try {
+                PaoSetRemote getpaoset = getpaoset("HYCONFIRMATIONORDER");
+                getpaoset.setInsertSite(siteid);
+                getpaoset.setWhere("fbillnum='"+where.getString("fbillnum")+"'");
+                getpaoset.reset();
+                if(getpaoset.isEmpty())return getReturnObject_err("没有该服务确认单").toString();
+                afterserviceorder hyconfirmationorder = (afterserviceorder)getpaoset.getPao(0);
+                if(!hyconfirmationorder.getString("fstatus").equals("新建"))return getReturnObject_err("非新建不可删除").toString();
+                hyconfirmationorder.delete();
+                getpaoset.save();
+                return getReturnObject_suc().toString();
+            } catch (P2Exception e) {
+                e.printStackTrace();
+                return getReturnObject_err(e.getMessage()).toString();
+            }
+        }
+        return getReturnObject_err("缺少where参数").toString();
+    }
+
 
 
 }