diff --git a/bgs-framework/src/main/java/com/bgs/framework/config/ShiroConfig.java b/bgs-framework/src/main/java/com/bgs/framework/config/ShiroConfig.java index a16ca14..c596bf1 100644 --- a/bgs-framework/src/main/java/com/bgs/framework/config/ShiroConfig.java +++ b/bgs-framework/src/main/java/com/bgs/framework/config/ShiroConfig.java @@ -289,6 +289,7 @@ public class ShiroConfig filterChainDefinitionMap.put("/ajax/**", "anon"); filterChainDefinitionMap.put("/js/**", "anon"); filterChainDefinitionMap.put("/ruoyi/**", "anon"); + filterChainDefinitionMap.put("/api/**", "anon"); filterChainDefinitionMap.put("/captcha/captchaImage**", "anon"); // 匿名访问不鉴权注解列表 List permitAllUrl = SpringUtils.getBean(PermitAllUrlProperties.class).getUrls(); diff --git a/bgs-webapi/src/main/java/com/bgs/webapi/controller/ApiController.java b/bgs-webapi/src/main/java/com/bgs/webapi/controller/ApiController.java new file mode 100644 index 0000000..bcb5bd3 --- /dev/null +++ b/bgs-webapi/src/main/java/com/bgs/webapi/controller/ApiController.java @@ -0,0 +1,86 @@ +package com.bgs.webapi.controller; + + +import com.bgs.common.core.domain.AjaxResult; +import com.bgs.webapi.doman.BindingSubmitBeen; +import com.bgs.webapi.service.ApiService; +import com.bgs.webapi.service.LoginService; +import org.apache.ibatis.annotations.Param; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * Created by wangh on 2020/7/17-15:18。 + */ +@RestController +@RequestMapping("/api") +public class ApiController { + @Autowired + ApiService service; + + + @PostMapping("/bindingSubmit") + public AjaxResult bindingSubmit(@RequestBody BindingSubmitBeen submitBeen) { + List watBills = submitBeen.getWatBills(); + watBills.forEach(code -> { + String epc = service.selectEpcByWaybill(code); + if (epc == null) { + int i = service.insertLedgerBinding(submitBeen.getEpc(), code); + } + }); + + return AjaxResult.success(); + } + + + + @PostMapping("/findBindingList") + public AjaxResult findBindingList(String epc) { + List codes = service.findBindingList(epc); + if (codes == null || codes.isEmpty()) return AjaxResult.error("没有运单绑定该货框"); + + return AjaxResult.success(codes); + } + + @PostMapping("/deleteBindingList") + public AjaxResult deleteBindingList(String epc) { + int i = service.deleteBindingList(epc); + if (i>0) return AjaxResult.success("全部解绑成功"); + + return AjaxResult.error(); + } + + @PostMapping("/deleteBindingItem") + public AjaxResult deleteBindingItem(String epc, String code) { + int i = service.deleteBindingItem(epc,code); + if (i==1) return AjaxResult.success("运单：" +code +"解绑成功"); + return AjaxResult.error(); + } + + /* @GetMapping("/getVersion") + public String getVersion(){ + APKVersion apkVersion=service.getVersion(); + apkVersion.setCode(0); + apkVersion.setMsg(""); + if (apkVersion==null){ + apkVersion=new APKVersion(); + apkVersion.setUpdateStatus(0); + + + }else { + apkVersion.setUpdateStatus(1); + } + + + String s = JSONObject.toJSONString(apkVersion); + System.out.println("请求版本信息"+s); + return s; + }*/ + + +} diff --git a/bgs-webapi/src/main/java/com/bgs/webapi/controller/LoginController.java b/bgs-webapi/src/main/java/com/bgs/webapi/controller/LoginController.java index 9c2b861..d75b8c1 100644 --- a/bgs-webapi/src/main/java/com/bgs/webapi/controller/LoginController.java +++ b/bgs-webapi/src/main/java/com/bgs/webapi/controller/LoginController.java @@ -1,8 +1,10 @@ package com.bgs.webapi.controller; +import com.bgs.common.core.domain.AjaxResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.bgs.webapi.service.LoginService; @@ -17,11 +19,12 @@ public class LoginController { LoginService service; - - @GetMapping("/login/finduser") - public String finduser(String name,String pass){ - System.out.println("登录名称= "+name+" pass= "+pass); - return service.login(name,pass); + @PostMapping("/login/finduser") + public AjaxResult finduser(String name, String pass) { + System.out.println("登录名称= " + name + " pass= " + pass); + Integer userId = service.login(name, pass); + if (userId == null) return AjaxResult.error(); + return AjaxResult.success(); } /* @GetMapping("/getVersion") @@ -45,5 +48,4 @@ public class LoginController { }*/ - } diff --git a/bgs-webapi/src/main/java/com/bgs/webapi/doman/BindingSubmitBeen.java b/bgs-webapi/src/main/java/com/bgs/webapi/doman/BindingSubmitBeen.java new file mode 100644 index 0000000..95f43c9 --- /dev/null +++ b/bgs-webapi/src/main/java/com/bgs/webapi/doman/BindingSubmitBeen.java @@ -0,0 +1,56 @@ +package com.bgs.webapi.doman; + +import java.util.List; + +/** + * @author wanghao + * @date 2024/7/11 14:59 + */ +public class BindingSubmitBeen { + // private String barCode; + private String epc; + private String localtion; + private String number; + private String weight; + private List watBills; + + public String getEpc() { + return epc; + } + + public void setEpc(String epc) { + this.epc = epc; + } + + public String getLocaltion() { + return localtion; + } + + public void setLocaltion(String localtion) { + this.localtion = localtion; + } + + public String getNumber() { + return number; + } + + public void setNumber(String number) { + this.number = number; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public List getWatBills() { + return watBills; + } + + public void setWatBills(List watBills) { + this.watBills = watBills; + } +} diff --git a/bgs-webapi/src/main/java/com/bgs/webapi/mapper/ApiMapper.java b/bgs-webapi/src/main/java/com/bgs/webapi/mapper/ApiMapper.java new file mode 100644 index 0000000..94b59cd --- /dev/null +++ b/bgs-webapi/src/main/java/com/bgs/webapi/mapper/ApiMapper.java @@ -0,0 +1,26 @@ +package com.bgs.webapi.mapper; + + +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * Created by wangh on 2021/4/26-9:32。 + */ +@Repository +public interface ApiMapper { + + String selectEpcByWaybill(String code); + + int insertLedgerBinding(String epc, String code); + + + + List findBindingList(String epc); + + int deleteBindingList(String epc); + + int deleteBindingItem(String epc, String code); +} diff --git a/bgs-webapi/src/main/java/com/bgs/webapi/mapper/LoginMapper.java b/bgs-webapi/src/main/java/com/bgs/webapi/mapper/LoginMapper.java index ad57e63..bb43309 100644 --- a/bgs-webapi/src/main/java/com/bgs/webapi/mapper/LoginMapper.java +++ b/bgs-webapi/src/main/java/com/bgs/webapi/mapper/LoginMapper.java @@ -13,7 +13,7 @@ import java.util.List; public interface LoginMapper { String login_findSalt(String name); - int login_getUser(@Param("name") String name, @Param("passw") String passw); + Integer login_getUser(@Param("name") String name, @Param("passw") String passw); List selectMenuNameByUserID(Integer userID); diff --git a/bgs-webapi/src/main/java/com/bgs/webapi/service/ApiService.java b/bgs-webapi/src/main/java/com/bgs/webapi/service/ApiService.java new file mode 100644 index 0000000..0a045f5 --- /dev/null +++ b/bgs-webapi/src/main/java/com/bgs/webapi/service/ApiService.java @@ -0,0 +1,42 @@ +package com.bgs.webapi.service; + +import com.bgs.webapi.mapper.ApiMapper; +import com.bgs.webapi.mapper.LoginMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.io.UnsupportedEncodingException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.List; + +/** + * Created by wangh on 2021/4/26-9:27。 + */ +@Service +public class ApiService { + + @Autowired + ApiMapper mapper; + + public String selectEpcByWaybill(String code) { + return mapper.selectEpcByWaybill(code); + } + + public int insertLedgerBinding(String epc, String code) { + return mapper.insertLedgerBinding(epc,code); + } + + + public List findBindingList(String epc) { + return mapper.findBindingList(epc); + } + + public int deleteBindingList(String epc) { + return mapper.deleteBindingList(epc); + } + + public int deleteBindingItem(String epc, String code) { + return mapper.deleteBindingItem(epc,code); + } +} diff --git a/bgs-webapi/src/main/java/com/bgs/webapi/service/LoginService.java b/bgs-webapi/src/main/java/com/bgs/webapi/service/LoginService.java index dfbb0fc..c5f91f1 100644 --- a/bgs-webapi/src/main/java/com/bgs/webapi/service/LoginService.java +++ b/bgs-webapi/src/main/java/com/bgs/webapi/service/LoginService.java @@ -20,11 +20,12 @@ public class LoginService { @Autowired LoginMapper mapper; - public String login(String name, String pass) { - try { + public Integer login(String name, String pass) { + // try { String salt = mapper.login_findSalt(name); Integer userID = mapper.login_getUser(name, getMD5Str(name + pass + salt)); - if (userID != null) { + return userID; + /* if (userID != null) { List menuNameList=name.equals("admin")? mapper.selectMenuName(): mapper.selectMenuNameByUserID(userID); @@ -37,7 +38,7 @@ public class LoginService { } }catch (Exception e){ return "Error"; - } + }*/ } diff --git a/bgs-webapi/src/main/resources/mapper/ApiMapper.xml b/bgs-webapi/src/main/resources/mapper/ApiMapper.xml new file mode 100644 index 0000000..9d2726d --- /dev/null +++ b/bgs-webapi/src/main/resources/mapper/ApiMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + INSERT INTO bgs_wms_2024.ledger_instant_binding (cargo_frame_epc, waybill_number) VALUES (#{param1}, #{param2}); + + + + + + + delete from ledger_instant_binding WHERE cargo_frame_epc = #{epc} + + + delete from ledger_instant_binding WHERE cargo_frame_epc = #{param1} and waybill_number = #{param2} + + \ No newline at end of file