diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java new file mode 100644 index 0000000..2a9963f --- /dev/null +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java @@ -0,0 +1,73 @@ +package com.zcloud.controller.comprehensive; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.comprehensive.TrafficSecurityLocationManagementService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Tools; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/securitylocation") +public class TrafficSecurityLocationManagementController extends BaseController { + + @Autowired + private TrafficSecurityLocationManagementService locationManagementService; + //新增 + @RequestMapping(value = "/add") + @ResponseBody + public Object add() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + + String locationmanagement_id = this.get32UUID(); + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id + pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 + pd.put("LOCATIONMANAGEMENT_ID", locationmanagement_id); // 主键 + pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 + pd.put("ISDELETE", "0"); + + locationManagementService.save(pd); + map.put("result", errInfo); + map.put("pd", pd); + return map; + } + + @RequestMapping(value = "/listForSecurityLocationManagement") + @ResponseBody + public Object listForSecurityLocationManagement(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + String LOCATIONTYPE = pd.getString("LOCATIONTYPE"); // 关键词检索条件 + if (Tools.notEmpty(LOCATIONTYPE)) + pd.put("LOCATIONTYPE", LOCATIONTYPE.trim()); + + String TRANSPORTATIONCOMPANY = pd.getString("TRANSPORTATIONCOMPANY"); // 关键词检索条件 + if (Tools.notEmpty(TRANSPORTATIONCOMPANY)) + pd.put("REPLYSTTRANSPORTATIONCOMPANYATUS", TRANSPORTATIONCOMPANY.trim()); + + page.setPd(pd); + List varList = locationManagementService.listForSecurityLocationManagement(page); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java index f41b751..64d744f 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java @@ -41,6 +41,7 @@ public class TrafficSecurityNoticeController extends BaseController { String notificationId = this.get32UUID(); pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id + pd.put("CORPINFO_ID", Jurisdiction.getPOST_ID()); // 创建人id pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 pd.put("NOTIFICATION_ID", notificationId); // 主键 pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java index 8cfd4a7..49f976b 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java @@ -45,6 +45,7 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController page.setPd(pd); List varList = trafficSecurityWaybillRegistrationService.listForSecurityNotice(page); + map.put("varList", varList); map.put("page", page); map.put("result", errInfo); @@ -82,6 +83,13 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 pd.put("WAYBILLNUMBER", this.get32UUID()); // 添加时间 pd.put("ISDELETE", "0"); + Date shippingDate = DateUtil.str2Date(pd.getString("SHIPPINGDATE")); + if (shippingDate != null && shippingDate.after(new Date())) { + pd.put("WAYBILLSTATUS", "1"); + } else { + pd.put("WAYBILLSTATUS", "0"); + } + trafficSecurityWaybillRegistrationService.save(pd); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java index 9370001..91e6911 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java @@ -8,6 +8,11 @@ import java.util.List; @Mapper public interface TrafficSecurityCustomerManagementMapper { + /** + * 新增 + * @param page + * @return + */ void save(PageData pd); /** diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityLocationManagementMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityLocationManagementMapper.java new file mode 100644 index 0000000..7beb4d6 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityLocationManagementMapper.java @@ -0,0 +1,24 @@ +package com.zcloud.mapper.datasource.comprehensive; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface TrafficSecurityLocationManagementMapper { + /** + * 新增 + * @param page + * @return + */ + void save(PageData pd); + + /** + * 列表 + * @param page + * @return + */ + List datalistPage(Page page); +} diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityLocationManagementService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityLocationManagementService.java new file mode 100644 index 0000000..ded24b4 --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityLocationManagementService.java @@ -0,0 +1,12 @@ +package com.zcloud.service.comprehensive; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface TrafficSecurityLocationManagementService { + void save(PageData pd); + + List listForSecurityLocationManagement(Page page); +} diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityLocationManagementServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityLocationManagementServiceImpl.java new file mode 100644 index 0000000..d76a2b4 --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityLocationManagementServiceImpl.java @@ -0,0 +1,25 @@ +package com.zcloud.service.comprehensive.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityLocationManagementMapper; +import com.zcloud.service.comprehensive.TrafficSecurityLocationManagementService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class TrafficSecurityLocationManagementServiceImpl implements TrafficSecurityLocationManagementService { + @Autowired + private TrafficSecurityLocationManagementMapper locationManagementMapper; + @Override + public void save(PageData pd) { + locationManagementMapper.save(pd); + } + + @Override + public List listForSecurityLocationManagement(Page page) { + return locationManagementMapper.datalistPage(page); + } +} diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLocationManagementMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLocationManagementMapper.xml new file mode 100644 index 0000000..9502a10 --- /dev/null +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLocationManagementMapper.xml @@ -0,0 +1,107 @@ + + + + + BUS_TRAFFIC_LOCATION_MANAGEMENT + + + + + SYS_DICTIONARIES + + + + + f.LOCATIONMANAGEMENT_ID, + f.LOCATIONTYPE, + f.LOCATIONNAME, + f.ADDRESSDETAILS, + f.ADMINISTRATIVEREGIONS, + f.TRANSPORTATIONCOMPANY, + f.ISDELETE, + f.DELETOR, + f.DELETORNAME, + f.DELETETIME, + f.CREATOR, + f.CREATORNAME, + f.CREATETIME, + f.OPERATOR, + f.OPERATORNAME, + f.LONGITUDE, + f.LATITUDE, + f.OPERATTIME + + + + + LOCATIONMANAGEMENT_ID, + LOCATIONTYPE, + LOCATIONNAME, + ADDRESSDETAILS, + ADMINISTRATIVEREGIONS, + TRANSPORTATIONCOMPANY, + ISDELETE, + DELETOR, + DELETORNAME, + DELETETIME, + CREATOR, + CREATORNAME, + CREATETIME, + OPERATOR, + OPERATORNAME, + LONGITUDE, + LATITUDE, + OPERATTIME + + + + + #{LOCATIONMANAGEMENT_ID}, + #{LOCATIONTYPE}, + #{LOCATIONNAME}, + #{ADDRESSDETAILS}, + #{ADMINISTRATIVEREGIONS}, + #{TRANSPORTATIONCOMPANY}, + #{ISDELETE}, + #{DELETOR}, + #{DELETORNAME}, + #{DELETETIME}, + #{CREATOR}, + #{CREATORNAME}, + #{CREATETIME}, + #{OPERATOR}, + #{OPERATORNAME}, + #{LONGITUDE}, + #{LATITUDE}, + #{OPERATTIME} + + + + + + insert into + + ( + + ) values ( + + ) + + + + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml index 8454c09..afdfbaa 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml @@ -35,6 +35,7 @@ f.OPERATTIME, f.PRACTITIONERTYPE, f.TYPE, + f.SIGNING, f.TRANSPORTATIONCOMPANY @@ -61,6 +62,7 @@ OPERATORNAME, OPERATTIME, TYPE, + SIGNING, PRACTITIONERTYPE @@ -87,6 +89,7 @@ #{OPERATORNAME}, #{OPERATTIME}, #{TYPE}, + #{SIGNING}, #{PRACTITIONERTYPE}