|
@@ -189,12 +189,15 @@ public class UserAppController extends BaseController
|
|
|
* @return
|
|
|
*/
|
|
|
@PostMapping("/getXqdwList")
|
|
|
- public AjaxResult getXqdwList(Long accountId)
|
|
|
+ public AjaxResult getXqdwList(String regioncode,Long accountId)
|
|
|
{
|
|
|
ZnylXqdw znylXqdw = new ZnylXqdw();
|
|
|
if(StringUtils.isNotNull(accountId)){
|
|
|
znylXqdw.setAccountid(accountId);
|
|
|
}
|
|
|
+ if(StringUtils.isNotNull(regioncode)){
|
|
|
+ znylXqdw.setRegioncode(regioncode);
|
|
|
+ }
|
|
|
return AjaxResult.success(znylXqdwService.selectListByAccountId(znylXqdw));
|
|
|
}
|
|
|
|
|
@@ -263,13 +266,33 @@ public class UserAppController extends BaseController
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 移动端使用,删除监护人信息
|
|
|
+ * @param jhrId 监护人id
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @PostMapping("/deleteJhrInfo")
|
|
|
+ public AjaxResult deleteJhrInfo(Long jhrId){
|
|
|
+ return AjaxResult.success(znylJhrxxService.deleteZnylJhrxxById(jhrId));
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 移动端使用,硬件类别
|
|
|
+ * @param
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @PostMapping("/getDeviceType")
|
|
|
+ public AjaxResult getDeviceType(){
|
|
|
+ return AjaxResult.success(znylYjqdService.selectZnylYjqdList(null));
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 移动端使用,设备绑定
|
|
|
* @param
|
|
|
* @return
|
|
|
*/
|
|
|
@PostMapping("/bindEquip")
|
|
|
- public AjaxResult bindEquip(String devicenum,String openId,String type)
|
|
|
+ public AjaxResult bindEquip(Long devicetype,String devicenum,String openId,String type)
|
|
|
{
|
|
|
ZnylYjqd znylYjqd = znylYjqdService.selectZnylYjqdByCode(devicenum);
|
|
|
if (null != znylYjqd && null != znylYjqd.getId()) {
|
|
@@ -297,7 +320,7 @@ public class UserAppController extends BaseController
|
|
|
// znylYjzcxx.setRegpersontype();//注册人类别 ??
|
|
|
znylYjzcxx.setRegdatetime(DateUtils.getNowDate());
|
|
|
znylYjzcxx.setDevicenum(devicenum);
|
|
|
- znylYjzcxx.setProductid(znylYjqd.getId());//根据硬件编号查硬件清单的id
|
|
|
+ znylYjzcxx.setProductid(devicetype);// TODO 根据硬件类别查硬件清单的id
|
|
|
znylYjzcxx.setWardid(wardid);
|
|
|
znylYjzcxx.setAccountid(accountid);
|
|
|
znylYjzcxx.setCreateTime(DateUtils.getNowDate());
|