From 66942458f7753fe4ddee7c5ed3386d61cff28b24 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 01 四月 2025 13:55:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxjdzwcs' into jxjdzwcs

---
 src/main/java/com/zy/asrs/controller/OpenController.java |  426 ++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 343 insertions(+), 83 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 18c87c4..9a16f6c 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,26 +1,31 @@
 package com.zy.asrs.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.annotations.AppAuth;
 import com.core.common.BaseRes;
 import com.core.common.Cools;
 import com.core.common.R;
 import com.core.exception.CoolException;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.CommandInfo;
-import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
-import com.zy.asrs.entity.param.taskCreateParam;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.*;
 import com.zy.asrs.service.*;
+import com.zy.asrs.utils.Utils;
 import com.zy.common.web.BaseController;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.*;
+
+import static org.apache.ibatis.ognl.OgnlRuntime.setFieldValue;
 
 @Slf4j
 @RestController
@@ -37,30 +42,106 @@
     private TaskWrkController taskWrkController;
     @Autowired
     private BasDevpService basDevpService;
+    @Autowired
+    private ApiLogService apiLogService;
+    @Autowired
+    private BasCrnpService basCrnpService;
+    @Autowired
+    private StaDescService staDescService;
+    @Autowired
+    private LocMastService locMastService;
+    @Autowired
+    private BasCrnErrorService basCrnErrorService;
+
+    @Value("${wms.url}")
+    private String wmsUrl;
+
+    private static final boolean auth = true;
 
     public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
         add("ea1f0459efc02a79f046f982767939ae");
     }};
-
-    //鍒涘缓浠诲姟
-    @PostMapping("/taskCreate")
-    public R taskCreate(@RequestHeader String appkey,
-                          @RequestBody taskCreateParam param,
-                          HttpServletRequest request) {
+    //agv浠诲姟瀹屾垚
+    @PostMapping("/toAgvTaskOver")
+    @AppAuth(memo = "agv浠诲姟瀹屾垚鎺ュ彛")
+    public R getAgvTaskOver(@RequestHeader String appkey,
+                           @RequestBody TaskOverParam param,
+                           HttpServletRequest request){
         auth(appkey, param, request);
         if (Cools.isEmpty(param)) {
             return R.parse(BaseRes.PARAM);
         }
-        if (Cools.isEmpty(param.getTaskNo())) {
-            return R.error("浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
+        if (Cools.isEmpty(param.getWharfCode())){
+            return R.error("鐮佸ご[wharfCode]涓嶈兘涓虹┖");
         }
-        if (Cools.isEmpty(param.getIoType())) {
-            return R.error("浠诲姟绫诲瀷[ioType]涓嶈兘涓虹┖");
+        if (Cools.isEmpty(param.getStatus())){
+            return R.error("瀹屾垚鏍囪[status]涓嶈兘涓虹┖");
         }
-        if (Cools.isEmpty(param.getBarcode())) {
-            return R.error("鏉$爜[barcode]涓嶈兘涓虹┖");
+        openService.getAgvTaskOver(param);
+        return R.ok();
+    }
+
+    //鍒涘缓浠诲姟
+    @PostMapping("/taskCreate")
+    @Transactional
+    public R taskCreate(@RequestHeader String appkey,
+                          @RequestBody List<TaskCreateParam> param1,
+                          HttpServletRequest request) {
+        auth(appkey, param1, request);
+        try{
+            List<TaskCreateParam> paramList = new ArrayList<>();
+            List<String> locNoList = new ArrayList<>();
+            for (TaskCreateParam param : param1) {
+                if (Cools.isEmpty(param)) {
+                    return R.parse(BaseRes.PARAM);
+                }
+                if (Cools.isEmpty(param.getTaskNo())) {
+                    return R.error("浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
+                }
+                if (Cools.isEmpty(param.getIoType())) {
+                    return R.error("浠诲姟绫诲瀷[ioType]涓嶈兘涓虹┖");
+                }
+                if (Cools.isEmpty(param.getBarcode())) {
+                    return R.error("鏉$爜[barcode]涓嶈兘涓虹┖");
+                }
+                String locNo=null;
+                if(param.getIoType()==1){
+                    locNo=param.getTargetPoint();
+                }else{
+                    locNo=param.getStartPoint();
+                }
+                try{
+                    LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+                            .eq("loc_no", locNo).ne("loc_sts","X"));
+                    if (Cools.isEmpty(locMast)){
+                        log.error("搴撲綅鍙蜂笉瀛樺湪"+locNo);
+                        return R.error("搴撲綅鍙蜂笉瀛樺湪"+locNo).add("搴撲綅鍙蜂笉瀛樺湪"+locNo);
+                    }
+                }catch (Exception e){
+                    log.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�"+e);
+                    return R.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�").add("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�"+e);
+                }
+                LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>()
+                        .eq("loc_sts","F")
+                        .eq("loc_no",locNo)
+                        .eq("barcode",param.getBarcode()));
+                if(Cools.isEmpty(locMast)){
+                    return R.error("璇ュ簱浣嶄笉婊¤冻鍑哄簱鏉′欢"+param.getTargetPoint());
+                }
+                if (!locNoList.contains(locMast.getLocNo())){
+                    locNoList.add(locMast.getLocNo());
+                    paramList.add(param);
+                }else {
+                    return R.error("璇ュ簱浣嶄笉鑳藉悓鏃朵笅鍙戜袱绗斾换鍔�"+locMast.getLocNo());
+                }
+            }
+            for (TaskCreateParam param : paramList){
+                openService.taskCreate(param);
+            }
+        }catch (Exception e){
+            log.error("浠诲姟涓嬪彂寮傚父"+e);
+            return R.error();
         }
-        openService.taskCreate(param);
         return R.ok();
     }
 
@@ -75,6 +156,44 @@
             return R.error("浠诲姟涓嶅瓨鍦�");
         }
         return R.ok().add(taskWrk);
+    }
+
+    //鍙栨斁璐х敵璇�
+    @PostMapping("/pick/and/place/v1")
+    @AppAuth(memo = "agv鍙栨斁璐х敵璇�")
+    public R getAgvPickAndPlaceV1(@RequestHeader String appkey,
+                            @RequestBody TaskOverParam param,
+                            HttpServletRequest request){
+        auth(appkey, param, request);
+        if (Cools.isEmpty(param)) {
+            return R.parse(BaseRes.PARAM);
+        }
+        if (Cools.isEmpty(param.getStaNo())){
+            return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
+        }
+        if (Cools.isEmpty(param.getType())){
+            return R.error("绫诲瀷[type]涓嶈兘涓虹┖");
+        }
+        return openService.getAgvPickAndPlaceV1(param);
+    }
+
+    //鍙栨斁璐у畬鎴愬弽棣�
+    @PostMapping("/pick/and/place/v2")
+    @AppAuth(memo = "agv鍙栨斁璐у畬鎴愬弽棣�")
+    public R getAgvPickAndPlaceV2(@RequestHeader String appkey,
+                                  @RequestBody TaskOverParam param,
+                                  HttpServletRequest request){
+        auth(appkey, param, request);
+        if (Cools.isEmpty(param)) {
+            return R.parse(BaseRes.PARAM);
+        }
+        if (Cools.isEmpty(param.getStaNo())){
+            return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
+        }
+        if (Cools.isEmpty(param.getType())){
+            return R.error("绫诲瀷[type]涓嶈兘涓虹┖");
+        }
+        return openService.getAgvPickAndPlaceV2(param);
     }
 
     //鏌ヨ浠诲姟鎸囦护闆嗗悎
@@ -105,9 +224,12 @@
 
     //AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛
     @PostMapping("/targetWharfApply")
+    @AppAuth(memo = "AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛")
     public R targetWharfApply(@RequestHeader String appkey,
                               @RequestBody WMSAndAGVInterfaceParam param,
-                              HttpServletRequest request) {
+                              HttpServletRequest request) throws IOException {
+        auth(appkey,param,request);
+
         if (Cools.isEmpty(param)){
             return R.error("鍙傛暟涓虹┖锛�");
         } else if (Cools.isEmpty(param.getTaskNo())){
@@ -119,16 +241,25 @@
         } else if (Cools.isEmpty(param.getFreeWharfs()) || param.getFreeWharfs().size()==0){
             return R.error("绌洪棽鐨勫叆搴撶爜澶达紙AGV锛変负绌猴紒");
         }
-        TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
-
-        return R.ok(taskWrk.getStartPoint());
+        R r = openService.AgvToWCSToWms(param);
+        apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
+                ,request.getRemoteAddr()+request.getRequestURI()
+                ,appkey
+                ,request.getRemoteAddr()
+                ,JSON.toJSONString(param)
+                ,r.toString()
+                ,true
+        );
+        return r;
     }
 
     //AGV璇锋眰鍔ㄤ綔鎺ュ彛
     @PostMapping("/agvTaskRequest")
+    @AppAuth(memo = "AGV璇锋眰鍔ㄤ綔鎺ュ彛")
     public R agvTaskRequest(@RequestHeader String appkey,
                               @RequestBody WMSAndAGVInterfaceParam param,
                               HttpServletRequest request) {
+        auth(appkey, param, request);
         if (Cools.isEmpty(param)){
             return R.error("鍙傛暟涓虹┖锛�");
         } else if (Cools.isEmpty(param.getRequestType())){
@@ -136,58 +267,124 @@
         } else if (Cools.isEmpty(param.getWharfCode())){
             return R.error("鐮佸ご缂栧彿涓虹┖锛�");
         }
-        BasDevp basDevp = basDevpService.selectById(param.getWharfCode());
-        if (basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")){
-            return R.ok();
-        }else {
-            return R.error();
+
+        Map<String,Integer> map = new HashMap<>();
+        map.put("J-1102",102);map.put("J-1101",101);
+        map.put("J-1103",105);map.put("J-1104",106);
+        map.put("J-1105",109);map.put("J-1106",110);
+        map.put("J-1107",113);map.put("J-1108",114);
+        map.put("J-1109",117);map.put("J-1110",118);
+        map.put("J-1111",121);map.put("J-1112",122);
+        map.put("H-1102",300);map.put("H-1101",305);
+        map.put("G-1102",400);map.put("G-1101",405);
+//        StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+//                .eq("stn_desc", param.getWharfCode()));
+//
+//        if (Cools.isEmpty(staDesc)){
+//            return R.error("绋嬪簭鎶ラ敊锛屾湭鏌ヨ鍒扮珯鐐�");
+//        }
+        if (Cools.isEmpty(map.get(param.getWharfCode()))){
+            return R.error("鏈煡璇㈠埌绔欑偣");
         }
+        BasDevp basDevp = basDevpService.selectById(map.get(param.getWharfCode()));
+//        BasDevp basDevp = basDevpService.selectById(staDesc.getStnNo());
+        if (basDevp.getAutoing().equals("Y") && (basDevp.getInEnable().equals("Y") || basDevp.getOutEnable().equals("Y"))){
+            apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
+                    ,request.getRemoteAddr()+request.getRequestURI()
+                    ,appkey
+                    ,request.getRemoteAddr()
+                    ,JSON.toJSONString(param)
+                    ,R.ok().toString()
+                    ,true
+            );
+            return R.ok("鍙叆");
+        }else {
+            apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
+                    ,request.getRemoteAddr()+request.getRequestURI()
+                    ,appkey
+                    ,request.getRemoteAddr()
+                    ,JSON.toJSONString(param)
+                    ,R.error("绔欑偣鐘舵�佷笉鍙叆").toString()
+                    ,true
+            );
+            return R.error("绔欑偣鐘舵�佷笉鍙叆");
+        }
+
+
+
+
+
     }
 
     //浠诲姟涓嬪彂鎺ュ彛
     @PostMapping("/outboundTaskSend")
-    public R outboundTaskSend(@RequestHeader String appkey,
-                              @RequestBody WMSAndAGVInterfaceParam param,
-                              HttpServletRequest request) {
-        try {
+    @Transactional
+    public HashMap<String, Object> outboundTaskSend(@RequestBody HashMap<String,Object> hashMap) {
+        String jsonString = JSON.toJSONString(hashMap.get("TaskList"));
+        List<CarryParam> params= JSONObject.parseArray(jsonString,CarryParam.class);
+        HashMap<String, Object> map = new HashMap<>();
+        List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>();
+        for (CarryParam param:params){
             if (Cools.isEmpty(param)){
-                return R.error("鍙傛暟涓虹┖锛�");
+                map.put("Code","0");
+                map.put("Msg","鍙傛暟涓虹┖锛�");
+                return map;
             } else if (Cools.isEmpty(param.getTaskNo())){
-                return R.error("浠诲姟鍙蜂负绌猴紒");
-            } else if (Cools.isEmpty(param.getTaskType())){
-                return R.error("浠诲姟绫诲瀷涓虹┖锛�");
-            } else if (Cools.isEmpty(param.getWarehouseId())){
-                return R.error("浠撳簱鏍囪瘑涓虹┖锛�");
+                map.put("Code","0");
+                map.put("Msg","浠诲姟鍙蜂负绌猴紒");
+                return map;
+            } else if (Cools.isEmpty(param.getStereoscopicTaskType())){
+                map.put("Code","0");
+                map.put("Msg","浠诲姟绫诲瀷涓虹┖锛�");
+                return map;
             }
-            if (Cools.isEmpty(param.getTaskPriority())){
-                param.setTaskPriority(1);
-            }
-            if (Cools.isEmpty(param.getContainerCode())){
-                return R.error("瀹瑰櫒缂栫爜(鎵樼洏鐮�)涓虹┖锛�");
-            }
-            if (Cools.isEmpty(param.getEmptyContainer())){
-                return R.error("鏄惁绌烘墭鐩樹俊鍙蜂负绌猴紒");
-            }
-//        if (Cools.isEmpty(param.getTaskTunnel())){
-//            return R.error("浠诲姟宸烽亾涓虹┖锛�");
-//        }
-//        if (Cools.isEmpty(param.getGroupNo())){
-//            return R.error("浠诲姟缁勪负绌猴紒");
-//        }
-//        if (Cools.isEmpty(param.getTaskSerialNo())){
-//            return R.error("浠诲姟鎵ц椤哄簭涓虹┖锛�");
-//        }
-            if (Cools.isEmpty(param.getTargetWharf())){
-                return R.error("鐩爣鐮佸ご鍖哄煙涓虹┖锛�");//G寮�澶�=7杞﹂棿锛孒寮�澶�=8灞傦紝J寮�澶�=9杞﹂棿
+            String fusion = Utils.Fusion(param.getOriginalRowNo(), param.getOriginalFloorNo(), param.getOriginalColumnNo());
+            param.setStartPoint(fusion);
+            LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
+            if(Cools.isEmpty(locMast)){
+                map.put("Code","0");
+                map.put("Msg","鍒濆搴撲綅鏃犳硶鎵惧埌锛�");
+                return map;
             }
 
-            openService.taskCreate(new taskCreateParam(param));
+            HashMap<String,Object> r = new HashMap<>();
 
-            return R.ok(param);
-        }catch (Exception e){
-            String errorMsg = Cools.isEmpty(e.getLocalizedMessage()) ? "" : e.getLocalizedMessage();
-            return R.ok("鐢熸垚浠诲姟澶辫触锛岃鑱旂郴绠$悊鍛�!"+ errorMsg);
+            if(param.getStereoscopicTaskType() == 2){
+                //鍑哄簱浠诲姟鍒涘缓
+                StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+                        .eq("type_no",2)
+                        .eq("crn_no",locMast.getCrnNo())
+                        .eq("stn_no",param.getTerminalNo()));
+                if(Cools.isEmpty(staDesc)){
+                    map.put("Code","0");
+                    map.put("Msg","鍑哄簱璺姴涓嶅瓨鍦紒");
+                    return map;
+                }
+                r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo()));
+                if(r.get("Code").equals("0")){
+                    return r;
+                }
+            }else if (param.getStereoscopicTaskType() == 3){
+                String fusion1 = Utils.Fusion(param.getGoalRowNo(), param.getGoalFloorNo(), param.getGoalColumnNo());
+                param.setTerminalNo(fusion1);
+                //绉诲簱浠诲姟鍒涘缓
+                r = openService.taskCreate(new TaskCreateParam(param,locMast.getCrnNo()));
+                if(r.get("Code").equals("0")){
+                    return r;
+                }
+            }
+            apiLogService.save("Wms浠诲姟涓嬪彂鎺ュ彛"
+                    ,request.getRemoteAddr()+request.getRequestURI()
+                    ,""
+                    ,request.getRemoteAddr()
+                    ,JSON.toJSONString(param)
+                    ,r.toString()
+                    ,true
+            );
         }
+        map.put("Code","1");
+        map.put("Msg","ok");
+        return map;
     }
 
     //浠诲姟鍙栨秷鎺ュ彛
@@ -195,39 +392,34 @@
     public R taskCancel(@RequestHeader String appkey,
                                @RequestBody WMSAndAGVInterfaceParam param,
                                HttpServletRequest request) {
+        auth(appkey, param, request);
         if (Cools.isEmpty(param)){
             return R.error("鍙傛暟涓虹┖锛�");
         } else if (Cools.isEmpty(param.getTaskNo())){
             return R.error("宸ヤ綔鍙蜂负绌猴紒");
-        } else if (Cools.isEmpty(param.getTaskStatus())){
+        } else if (Cools.isEmpty(param.getIoType())){
             return R.error("鎿嶄綔绫诲瀷涓虹┖锛�");
+        } else if (Cools.isEmpty(param.getBarcode())){
+            return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒");
         }
-//        else if (Cools.isEmpty(param.getWarehouseId())){
-//            return R.error("浠撳簱鏍囪瘑涓虹┖锛�");
-//        }
 
-        TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("task_no", param.getTaskNo()));
+        TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>()
+                .eq("task_no", param.getTaskNo())
+                .eq("io_type",param.getIoType())
+                .eq("barcode",param.getBarcode()));
         if (Cools.isEmpty(taskWrk)){
-            return R.error("鏈煡鍒板綋鍓嶄换鍔�");
+            return R.error("鏈煡鍒板綋鍓嶄换鍔�---"+param);
         }
         boolean sign =false;
         switch (param.getTaskStatus()){
-            case "1"://姝e父鍙栨秷
-                if (taskWrk.getWrkSts()>1){
+            case 1://姝e父鍙栨秷
+                if (taskWrk.getStatus()>1){
                     return R.error("浠诲姟宸插紑濮嬫墽琛�");
-                }
-            case "2"://寮哄埗鍙栨秷
-                if (taskWrk.getWrkSts()>3){
-                    return R.error("浠诲姟宸叉墽琛屽畬鎴�");
                 }
                 break;
-            case "3"://姝e父瀹屾垚
-                if (taskWrk.getWrkSts()>11){
+            case 2://姝e父瀹屾垚
+                if (taskWrk.getStatus()>1){
                     return R.error("浠诲姟宸插紑濮嬫墽琛�");
-                }
-            case "4"://寮哄埗瀹屾垚
-                if (taskWrk.getWrkSts()>14){
-                    return R.error("浠诲姟宸叉墽琛屽畬鎴�");
                 }
                 sign=true;
                 break;
@@ -250,4 +442,72 @@
         }
     }
 
+    //璁惧鐘舵�佹煡璇㈡帴鍙�
+    @GetMapping("/deviceStatus")
+    @Transactional
+    public R deviceStatus() {
+        List<CrnStatusParam> crnStatusParams=new ArrayList<>();
+        List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+        for (BasCrnp basCrnp:basCrnps){
+            CrnStatusParam crnStatusParam=new CrnStatusParam();
+            crnStatusParam.setCrnNo(basCrnp.getCrnNo());
+            crnStatusParam.setCrnSts(basCrnp.getCrnSts());
+            crnStatusParam.setErrorCode(basCrnp.getCrnErr());
+            BasCrnError error=basCrnErrorService.selectOne(new EntityWrapper<BasCrnError>().eq("error_code",basCrnp.getCrnErr()));
+            if(Cools.isEmpty(error)){
+                crnStatusParam.setErrorMsg("");
+            }else {
+                crnStatusParam.setErrorMsg(error.getErrName());
+            }
+            crnStatusParams.add(crnStatusParam);
+        }
+        return R.ok(crnStatusParams);
+    }
+
+    public static <T> List<T> convertListMapToListObject(List<HashMap<String, Object>> listMap, Class<T> clazz) throws Exception {
+        List<T> list = new ArrayList<>();
+
+        for (Map<String, Object> map : listMap) {
+            T obj = clazz.getDeclaredConstructor().newInstance();
+
+            for (Map.Entry<String, Object> entry : map.entrySet()) {
+                String key = entry.getKey();
+                Object value = entry.getValue();
+
+                try {
+                    Field field = clazz.getDeclaredField(key);
+                    field.setAccessible(true);
+                    setFieldValue(obj, field, value);
+                } catch (NoSuchFieldException e) {
+                    System.out.println("No such field: " + key + " in class " + clazz.getName());
+                }
+            }
+
+            list.add(obj);
+        }
+
+        return list;
+    }
+    private static void setFieldValue(Object obj, Field field, Object value) throws IllegalAccessException {
+        Class<?> fieldType = field.getType();
+
+        if (fieldType.isAssignableFrom(value.getClass())) {
+            field.set(obj, value);
+        } else if (fieldType == int.class || fieldType == Integer.class) {
+            field.set(obj, ((Number) value).intValue());
+        } else if (fieldType == long.class || fieldType == Long.class) {
+            field.set(obj, ((Number) value).longValue());
+        } else if (fieldType == double.class || fieldType == Double.class) {
+            field.set(obj, ((Number) value).doubleValue());
+        } else if (fieldType == float.class || fieldType == Float.class) {
+            field.set(obj, ((Number) value).floatValue());
+        } else if (fieldType == boolean.class || fieldType == Boolean.class) {
+            field.set(obj, (Boolean) value);
+        } else if (fieldType == String.class) {
+            field.set(obj, String.valueOf(value));
+        } else {
+            System.out.println("Unsupported field type: " + fieldType.getName());
+        }
+    }
+
 }

--
Gitblit v1.9.1