From fb050c0dafa5363a73540dd9e52b78487e25ba0a Mon Sep 17 00:00:00 2001 From: kongdeqiang <123456> Date: 星期二, 09 四月 2024 17:32:46 +0800 Subject: [PATCH] fix:新增手动抬杆记录 --- src/main/java/com/boying/controller/car/PlateServlet.java | 1199 ++++++++++++++++++++++++++++++----------------------------- 1 files changed, 601 insertions(+), 598 deletions(-) diff --git a/src/main/java/com/boying/controller/car/PlateServlet.java b/src/main/java/com/boying/controller/car/PlateServlet.java index 321eeb6..bd6a911 100644 --- a/src/main/java/com/boying/controller/car/PlateServlet.java +++ b/src/main/java/com/boying/controller/car/PlateServlet.java @@ -36,601 +36,604 @@ /** * Servlet implementation class PlateServlet */ -@Controller -@RequestMapping("/car") -@RequiredArgsConstructor -public class PlateServlet extends HttpServlet { - private static final long serialVersionUID = 1L; - private final SystemConfigProperties systemConfigProperties; - private final StringRedisTemplate redisTemplate; - private final ParkService parkService; - private final OutParkService outParkService; - private final EnterParkService enterParkService; - private final BarrierService barrierService; - private final TicketService ticketService; - private final CostRuleService costRuleService; - private final LedShowService ledShowService; - private final WhiteListService whiteListService; - - /** - * 鍥炲寮�闂� - */ - protected void open(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - response.setContentType("text/json"); - PrintWriter out = response.getWriter(); - out.println("{\"Response_AlarmInfoPlate\":{\"info\":\"ok\",\"content\":\"...\",\"is_pay\":\"true\"}}"); - out.flush(); - out.close(); - } - - //杞爜 - public static String deCode(String str) { - try { - byte[] b = str.getBytes("UTF-8");//锟斤拷锟斤拷 - String sa = new String(b);//锟斤拷锟斤拷:锟斤拷什么锟街凤拷锟斤拷锟斤拷锟斤拷锟斤拷锟绞裁达拷址锟斤拷锟斤拷锟斤拷锟� - //String sa = new String(str.getBytes()); - - return sa; - } catch (Exception e) { - e.printStackTrace(); - return ""; - } - } - - protected void noOpen(HttpServletRequest request, HttpServletResponse response) throws IOException { - response.setContentType("text/json"); - PrintWriter out = response.getWriter(); - out.println("{\"Response_AlarmInfoPlate\":{\"info\":\"error\",\"content\":\"...\",\"is_pay\":\"false\"}}"); - out.flush(); - out.close(); - } - - @PostMapping("/status") - public void heart(String serialno,HttpServletRequest request,HttpServletResponse response) throws ServletException, IOException { - Barrier barrier = barrierService.findByCode(serialno); - Park park = parkService.getById(barrier.getParkId()); - String redis = redisTemplate.opsForValue().get("park_up_" + park.getId()); - String redisnum = redisTemplate.opsForValue().get("car_park_" + park.getId()); - if(StringUtils.isBlank(redis) || redis.equals("false")){ - return; - } - if(barrier!=null){ - if(barrier.getType2()==1){ - open(request,response); - if(barrier.getType() == 1){ - int i = Integer.parseInt(redisnum); - i++; - redisTemplate.opsForValue().set("car_park_" + park.getId(),Integer.toString(i),30, TimeUnit.DAYS); - }else if(barrier.getType() == 0){ - int i = Integer.parseInt(redisnum); - i--; - if(i<0){ - redisTemplate.opsForValue().set("car_park_" + park.getId(),"0",30, TimeUnit.DAYS); - redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS); - }else { - redisTemplate.opsForValue().set("car_park_" + park.getId(),Integer.toString(i),30, TimeUnit.DAYS); - redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS); - } - - } - barrier.setType2(0); - barrier.setUpdateTime(LocalDateTime.now()); - barrierService.saveOrUpdate(barrier); - //outLedShowDefault(barrier.getCode(),barrier.getParkId()); - return; - } - barrier.setStatus(0); - barrier.setUpdateTime(LocalDateTime.now()); - barrierService.saveOrUpdate(barrier); - - OutPark outPark = outParkService.count4(barrier.getId()); - if(outPark!=null){ - open(request,response); - if(barrier.getType() == 0){ - int i = Integer.parseInt(redisnum); - i--; - if(i<0){ - redisTemplate.opsForValue().set("car_park_" + park.getId(),"0",30, TimeUnit.DAYS); - redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS); - }else { - redisTemplate.opsForValue().set("car_park_" + park.getId(),Integer.toString(i),30, TimeUnit.DAYS); - redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS); - } - } - outPark.setStatus2(1); - outParkService.saveOrUpdate(outPark); - //outLedShowDefault(barrier.getCode(),barrier.getParkId()); - - }else{ - noOpen(request,response); - } - } - } - /** - * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response) - */ - @PostMapping("/PlateServlet") - protected void info(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - String s= ""; - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss"); - BufferedReader reader = new BufferedReader(new InputStreamReader(request.getInputStream(),"UTF-8")); - String str = ""; - String lineStr = ""; - while((str = reader.readLine()) != null){ - lineStr += str; - } - System.out.println("鑾峰彇鍒扮殑閬撻椄鎺ㄩ�佹暟鎹负锛�"+lineStr); - - JSONObject jsonObject1 = JSON.parseObject(lineStr); - JSONObject alarmInfoPlate = jsonObject1.getJSONObject("AlarmInfoPlate"); - JSONObject result = alarmInfoPlate.getJSONObject("result"); - JSONObject plateResult = result.getJSONObject("PlateResult"); - String carNo = plateResult.get("license").toString(); - String code = alarmInfoPlate.get("serialno").toString(); - - try { - JsonParser parser=new JsonParser(); - do { - JsonObject jsonObject=(JsonObject) parser.parse(lineStr); - if( jsonObject == null || jsonObject.isJsonNull() ) { - break; - } - - JsonObject jsonInfoPlate = jsonObject.get("AlarmInfoPlate").getAsJsonObject(); - if( jsonInfoPlate == null || jsonInfoPlate.isJsonNull() ) { - break; - } - - JsonObject jsonResult = jsonInfoPlate.get("result").getAsJsonObject(); - if( jsonResult == null || jsonResult.isJsonNull() ) { - break; - } - - JsonObject jsonPlateResult = jsonResult.get("PlateResult").getAsJsonObject(); - if( jsonPlateResult == null || jsonPlateResult.isJsonNull() ) { - break; - } - - String license = jsonPlateResult.get("license").getAsString();//杞︾墝鍙� - if( license == null || license == "") { - break; - } - - String serialno = jsonInfoPlate.get("serialno").getAsString();//鎽勫儚鏈哄簭鍒楀彿 - if( serialno == null || serialno == "" ) { - break; - } - - System.out.println("缂栧彿锛�"+serialno+"璁惧璇嗗埆鍒颁簡锛�"+license); - String format = sdf.format(new Date()); - s+= format+",杞︾墝鍙蜂负锛�"+license+",serialno涓猴細"+code+" "; - - Barrier barrier = barrierService.findByCode(code); - System.out.println("鏌ヨ鍒伴亾闂镐负锛�"+barrier); - if(barrier==null){ - s+="鏌ヨ閬撻椄涓虹┖\n"; - }else{ - if(barrier.getType()==0){ - outPark(license, barrier.getId(), barrier.getParkId()); - s+=license+"-淇濆瓨鍑哄満璁板綍\n"; - }else{ - String num = redisTemplate.opsForValue().get("car_park_" + barrier.getParkId()); - if(StringUtils.isBlank(num)){ - num = "0"; - redisTemplate.opsForValue().set("car_park_" + barrier.getParkId(),num,30, TimeUnit.DAYS); - redisTemplate.opsForValue().set("park_up_" + barrier.getParkId(),"true",30, TimeUnit.DAYS); - } - Park byId = parkService.getById(barrier.getParkId()); - if(Integer.parseInt(num) >= byId.getNum() ){ - //led鏄剧ず - Boolean aBoolean = inLedFullShow(code, license,barrier.getParkId()); - }else { - //led鏄剧ず - Boolean aBoolean = inLedShow(code, license,barrier.getParkId()); - if(aBoolean){ - //鍏ュ満鎶潌 - open(request, response); - enterPark(license,barrier.getId(),barrier.getParkId()); - s+=license+"-淇濆瓨鍏ュ満璁板綍\n"; - } - } - } - } - writeTxt(s); - }while(false); - } - catch (Exception e) { - System.out.println("鏃犲叆鍦鸿褰�"); - s+=" ,鏌ヨ鍦哄唴璁板綍寮傚父"; - writeTxt(s); - } - } - - - private void writeTxt( String txt) - { - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); - try - { - FileWriter f = new FileWriter(systemConfigProperties.getLogPath()+sdf.format(new Date())+".txt",true); - BufferedWriter bw=new BufferedWriter(f); - bw.write(txt); - bw.newLine(); - bw.close(); - } - catch(Exception e) - { - System.out.println("鎵撳嵃閿欒"); - } - } - - - - - public void enterPark(String carNo,Integer barrierId,Integer parkId) { - Park park = parkService.getById(parkId); - int num = 0; - String s = redisTemplate.opsForValue().get("car_park_" + parkId); - if(park != null){ - num = park.getNum(); - if(s !=null){ - if(Integer.parseInt(s) >= num){ - redisTemplate.opsForValue().set("park_up_" + parkId,"false",30, TimeUnit.DAYS); - return; - } - }else { - s= "0"; - redisTemplate.opsForValue().set("car_park_" + parkId,s,30, TimeUnit.DAYS); - redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS); - } - } - enterParkService.deleteByCarNo(carNo,parkId); - EnterPark enterPark = new EnterPark(); - enterPark.setCarNo(carNo); - enterPark.setBarrierId(barrierId); - enterPark.setParkId(parkId); - - QueryWrapper<Ticket> wrapper = new QueryWrapper<>(); - wrapper.lambda() - .eq(Ticket::getCarNo,enterPark.getCarNo()) - .eq(Ticket::getPayStatus,1); - List<Ticket> tickets = ticketService.list(wrapper); - if(tickets.size()>0){ - enterPark.setStatus(1);//鍙戠幇鏈夎繚绔� - } - enterParkService.saveOrUpdate(enterPark); - - Barrier barrier = barrierService.getById(barrierId); - barrier.setType2(1); - barrierService.saveOrUpdate(barrier); - } - - public double outPark(String carNo,Integer barrierId,Integer parkId) { - double money = 0.0; - EnterPark enterPark = null; - String toDayHrMinSec = null; - OutPark outPark = new OutPark(); - outPark.setCarNo(carNo); - outPark.setParkId(parkId); - outPark.setBarrierId(barrierId); - outPark.setCreateTime(LocalDateTime.now()); - outPark.setCode(System.currentTimeMillis()+""); - List<EnterPark> byCarNo = enterParkService.findByCarNo(carNo,parkId); - - if(byCarNo.size() == 0){ - System.out.println(carNo+"鏈彂鐜板満鍐呰溅杈�"); - }else{ - enterPark = byCarNo.get(0); - System.out.println("鍏ュ満璁板綍锛�"+enterPark); - outPark.setEnterTime(enterPark.getCreateTime()); - try { - long l = outPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli() - enterPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli(); - outPark.setTime(l/(1000*60)); - toDayHrMinSec = DateUtilOther.millisToDayHrMinSec(l/(1000*60)); - money = costRuleService.getMoney(parkId, outPark.getEnterTime(), outPark.getCreateTime(), 1); - } catch (ParseException e) { - e.printStackTrace(); - } - - } - //outPark.setPrice(Double.valueOf(String.format("%.1f", money))); - outPark.setPrice(money); - outPark.setStatus3(findTicket(carNo)); - outParkService.saveOrUpdate(outPark); - Barrier barrier =barrierService.getById(barrierId); - barrier.setCarNo(carNo); - //led灞曠ず - if(toDayHrMinSec == null){ - toDayHrMinSec = "涓嶈冻涓ゅ皬鏃�"; - } - //鍒ゆ柇鏄惁鍦ㄧ櫧鍚嶅崟 - QueryWrapper<WhiteList> wrapper = new QueryWrapper<>(); - wrapper.lambda() - .eq(WhiteList::getCarNo,carNo); - List<WhiteList> all = whiteListService.list(wrapper); - if(all.size() >0){ - for(WhiteList w : all){ - if(w.getType()==0){ - outLedShow2(barrier.getCode(),barrier.getCarNo(),"鏈堢杞�",toDayHrMinSec,barrier.getParkId()); - barrier.setType2(1); - barrierService.saveOrUpdate(barrier); - OutPark byCarNoAndBarrierId = outParkService.findByCarNoAndBarrierId(carNo, barrierId); - byCarNoAndBarrierId.setStatus(1); - outParkService.saveOrUpdate(byCarNoAndBarrierId); - return 0.0; - }else{ - if(w.getParkIds()!=null){ - if(w.getEndTime()!=null){ - String parkIds = w.getParkIds(); - String[] split = parkIds.split(","); - for (String s : split) { - int pid = Integer.parseInt(s); - if(pid == outPark.getParkId() && System.currentTimeMillis()<w.getEndTime().getTime()){ - outLedShow2(barrier.getCode(),barrier.getCarNo(),"鏈堢杞�",toDayHrMinSec,barrier.getParkId()); - barrier.setType2(1); - barrierService.saveOrUpdate(barrier); - OutPark byCarNoAndBarrierId = outParkService.findByCarNoAndBarrierId(carNo, barrierId); - byCarNoAndBarrierId.setStatus(1); - outParkService.saveOrUpdate(byCarNoAndBarrierId); - return 0.0; - } - } - } - } - } - } - } - outLedShow(barrier.getCode(),barrier.getCarNo(),outPark.getPrice(),toDayHrMinSec,barrier.getParkId()); - if(outPark.getPrice()==0&&outPark.getStatus3()==0){ - barrier.setType2(1); - } - barrierService.saveOrUpdate(barrier); - return money; - } - - public int findTicket(String carNo){ - QueryWrapper<Ticket> wrapper = new QueryWrapper<>(); - wrapper.lambda() - .eq(Ticket::getCarNo,carNo) - .eq(Ticket::getPayStatus,1); - List<Ticket> tickets = ticketService.list(wrapper); - if(tickets.size()>0){ - return 1; - }else{ - return 0; - } - } - - public Boolean inLedShow(String ledId,String carNo,Integer parkId){ - String num = redisTemplate.opsForValue().get("car_park_" + parkId); - Park byId = parkService.getById(parkId); - int i = byId.getNum() - Integer.parseInt(num); - if(i<0){ - i = 0; - } - String carType = ""; - String carDay = ""; - Barrier barrier = barrierService.findByCode(ledId); - WhiteList byCarNo = whiteListService.getByCarNo(carNo); - if(byCarNo == null){ - carType = "涓存椂杞�"; - }else { - if (byCarNo.getType() == 0){ - //鐧藉悕鍗曟案涔呰溅杈� - carType = "鏈堢杞�"; - }else { - //鐧藉悕鍗曞浐瀹氬仠杞﹀満杞﹁締 - if(byCarNo.getParkId().equals(barrier.getParkId())){ - carType = "鏈堢杞�"; - long l = (byCarNo.getEndTime().getTime() - byCarNo.getStartTime().getTime()) / (24 * 3600 * 1000); - carDay = "鏈夋晥鏈熻繕鏈�"+l+"澶�"; - } - } - } - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - LedShow ledShow = new LedShow(); - ledShow.setLedId(ledId); - ledShow.setNumber(parkId); - ledShow.setStatus(1); - ledShow.setType(2); - ledShow.setName(barrier.getName()); - ledShow.setIsDefault(1); - ledShow.setPassword("boying_ffpark"); - ledShow.setTimeStamp(sdf.format(new Date())); - ledShow.setColor1(1); - ledShow.setColor2(2); - ledShow.setColor3(1); - ledShow.setColor4(2); - ledShow.setContent1(carNo); - ledShow.setContent2(carType); - ledShow.setContent3("杞︿綅鍓╀綑锛�"+i); - ledShow.setContent4(carDay); - ledShow.setDisMode1(0); - ledShow.setDisMode2(0); - ledShow.setDisMode3(1); - ledShow.setDisMode4(1); - ledShow.setStatus1(0); - ledShow.setStatus2(0); - ledShow.setStatus3(0); - ledShow.setStatus4(0); - if(barrier.getIpAddress() != null){ - ledShow.setIpAddress(barrier.getIpAddress()); - } - if(barrier.getPort() != 0){ - ledShow.setPort(barrier.getPort()); - } - ledShow.setVoiceContent(carNo+carType+"娆㈣繋杩涘満"); - return ledShowService.save(ledShow); - } - - public Boolean inLedFullShow(String ledId, String carNo, Integer parkId){ - String carType = ""; - String carDay = ""; - Barrier barrier = barrierService.findByCode(ledId); - WhiteList byCarNo = whiteListService.getByCarNo(carNo); - if(byCarNo == null){ - carType = "涓存椂杞�"; - }else { - if (byCarNo.getType() == 0){ - //鐧藉悕鍗曟案涔呰溅杈� - carType = "鏈堢杞�"; - }else { - //鐧藉悕鍗曞浐瀹氬仠杞﹀満杞﹁締 - if(byCarNo.getParkId().equals(barrier.getParkId())){ - carType = "鏈堢杞�"; - long l = (byCarNo.getEndTime().getTime() - byCarNo.getStartTime().getTime()) / (24 * 3600 * 1000); - carDay = "鏈夋晥鏈熻繕鏈�"+l+"澶�"; - } - } - } - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - LedShow ledShow = new LedShow(); - ledShow.setLedId(ledId); - ledShow.setNumber(parkId); - ledShow.setStatus(1); - ledShow.setType(2); - ledShow.setName(barrier.getName()); - ledShow.setIsDefault(1); - ledShow.setPassword("boying_ffpark"); - ledShow.setTimeStamp(sdf.format(new Date())); - ledShow.setColor1(1); - ledShow.setColor2(2); - ledShow.setColor3(1); - ledShow.setColor4(2); - ledShow.setContent1(carNo); - ledShow.setContent2(carType); - ledShow.setContent3("杞︿綅宸叉弧"); - ledShow.setContent4("璇烽┒绂�"); - ledShow.setDisMode1(0); - ledShow.setDisMode2(0); - ledShow.setDisMode3(1); - ledShow.setDisMode4(1); - ledShow.setStatus1(0); - ledShow.setStatus2(0); - ledShow.setStatus3(0); - ledShow.setStatus4(0); - if(barrier.getIpAddress() != null){ - ledShow.setIpAddress(barrier.getIpAddress()); - } - if(barrier.getPort() != 0){ - ledShow.setPort(barrier.getPort()); - } - ledShow.setVoiceContent("杞︿綅宸叉弧璇烽┒绂�"); - return ledShowService.save(ledShow); - } - - public Boolean outLedShow(String ledId,String carNo,Double price,String timeStamp,Integer parkId){ - Barrier barrier = barrierService.findByCode(ledId); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - LedShow ledShow = new LedShow(); - ledShow.setLedId(ledId); - ledShow.setNumber(parkId); - ledShow.setStatus(1); - ledShow.setType(2); - ledShow.setName(barrier.getName()); - ledShow.setIsDefault(1); - ledShow.setPassword("boying_ffpark"); - ledShow.setTimeStamp(sdf.format(new Date())); - ledShow.setColor1(1); - ledShow.setColor2(2); - ledShow.setColor3(1); - ledShow.setColor4(2); - ledShow.setContent1(carNo); - ledShow.setContent2("鍋滆溅"+timeStamp); - ledShow.setContent3("浜よ垂"+price+"鍏�"); - ledShow.setContent4("绂佹闂潌"); - ledShow.setDisMode1(0); - ledShow.setDisMode2(1); - ledShow.setDisMode3(1); - ledShow.setDisMode4(0); - ledShow.setStatus1(0); - ledShow.setStatus2(0); - ledShow.setStatus3(0); - ledShow.setStatus4(0); - if(barrier.getIpAddress() != null){ - ledShow.setIpAddress(barrier.getIpAddress()); - } - if(barrier.getPort() != 0){ - ledShow.setPort(barrier.getPort()); - } - ledShow.setVoiceContent(carNo+"鍋滆溅"+timeStamp+"浜よ垂"+price+"鍏�"); - return ledShowService.save(ledShow); - } - - public Boolean outLedShow2(String ledId,String carNo,String text,String timeStamp,Integer parkId){ - Barrier barrier = barrierService.findByCode(ledId); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - LedShow ledShow = new LedShow(); - ledShow.setLedId(ledId); - ledShow.setNumber(parkId); - ledShow.setStatus(1); - ledShow.setType(2); - ledShow.setName(barrier.getName()); - ledShow.setIsDefault(1); - ledShow.setPassword("boying_ffpark"); - ledShow.setTimeStamp(sdf.format(new Date())); - ledShow.setColor1(1); - ledShow.setColor2(2); - ledShow.setColor3(1); - ledShow.setColor4(2); - ledShow.setContent1(carNo); - ledShow.setContent2("鍋滆溅"+timeStamp); - ledShow.setContent3(text); - ledShow.setContent4("绂佹闂潌"); - ledShow.setDisMode1(0); - ledShow.setDisMode2(1); - ledShow.setDisMode3(1); - ledShow.setDisMode4(0); - ledShow.setStatus1(0); - ledShow.setStatus2(0); - ledShow.setStatus3(0); - ledShow.setStatus4(0); - if(barrier.getIpAddress() != null){ - ledShow.setIpAddress(barrier.getIpAddress()); - } - if(barrier.getPort() != 0){ - ledShow.setPort(barrier.getPort()); - } - ledShow.setVoiceContent(carNo+"鍋滆溅"+timeStamp); - return ledShowService.save(ledShow); - } - - public Boolean outLedShowDefault(String ledId,Integer parkId){ - Barrier barrier = barrierService.findByCode(ledId); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - LedShow ledShow = new LedShow(); - ledShow.setLedId(ledId); - ledShow.setNumber(parkId); - ledShow.setStatus(1); - ledShow.setType(2); - ledShow.setName(barrier.getName()); - ledShow.setIsDefault(1); - ledShow.setPassword("boying_ffpark"); - ledShow.setTimeStamp(sdf.format(new Date())); - ledShow.setColor1(1); - ledShow.setColor2(1); - ledShow.setColor3(1); - ledShow.setColor4(1); - ledShow.setContent1("娆㈣繋鍏変复"); - ledShow.setContent2("涓�杞︿竴鏉�"); - ledShow.setContent3("鍑忛�熸參琛�"); - ledShow.setContent4("瀹夊叏琛岄┒"); - ledShow.setDisMode1(0); - ledShow.setDisMode2(0); - ledShow.setDisMode3(0); - ledShow.setDisMode4(0); - ledShow.setStatus1(0); - ledShow.setStatus2(0); - ledShow.setStatus3(0); - ledShow.setStatus4(0); - if(barrier.getIpAddress() != null){ - ledShow.setIpAddress(barrier.getIpAddress()); - } - if(barrier.getPort() != 0){ - ledShow.setPort(barrier.getPort()); - } - ledShow.setVoiceContent(""); - return ledShowService.save(ledShow); - } - -} +//@Controller +//@RequestMapping("/car1") +//@RequiredArgsConstructor +//public class PlateServlet extends HttpServlet { +// private static final long serialVersionUID = 1L; +// private final SystemConfigProperties systemConfigProperties; +// private final StringRedisTemplate redisTemplate; +// private final ParkService parkService; +// private final OutParkService outParkService; +// private final EnterParkService enterParkService; +// private final BarrierService barrierService; +// private final TicketService ticketService; +// private final CostRuleService costRuleService; +// private final LedShowService ledShowService; +// private final WhiteListService whiteListService; +// +// /** +// * 鍥炲寮�闂� +// */ +// protected void open(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { +// response.setContentType("text/json"); +// PrintWriter out = response.getWriter(); +// out.println("{\"Response_AlarmInfoPlate\":{\"info\":\"ok\",\"content\":\"...\",\"is_pay\":\"true\"}}"); +// out.flush(); +// out.close(); +// } +// +// //杞爜 +// public static String deCode(String str) { +// try { +// byte[] b = str.getBytes("UTF-8");//锟斤拷锟斤拷 +// String sa = new String(b);//锟斤拷锟斤拷:锟斤拷什么锟街凤拷锟斤拷锟斤拷锟斤拷锟斤拷锟绞裁达拷址锟斤拷锟斤拷锟斤拷锟� +// //String sa = new String(str.getBytes()); +// +// return sa; +// } catch (Exception e) { +// e.printStackTrace(); +// return ""; +// } +// } +// +// protected void noOpen(HttpServletRequest request, HttpServletResponse response) throws IOException { +// response.setContentType("text/json"); +// PrintWriter out = response.getWriter(); +// out.println("{\"Response_AlarmInfoPlate\":{\"info\":\"error\",\"content\":\"...\",\"is_pay\":\"false\"}}"); +// out.flush(); +// out.close(); +// } +// +// @PostMapping("/status") +// public void heart(String serialno,HttpServletRequest request,HttpServletResponse response) throws ServletException, IOException { +// Barrier barrier = barrierService.findByCode(serialno); +// Park park = parkService.getById(barrier.getParkId()); +// String redis = redisTemplate.opsForValue().get("park_up_" + park.getId()); +// String redisnum = redisTemplate.opsForValue().get("car_park_" + park.getId()); +// if(StringUtils.isBlank(redis) || redis.equals("false")){ +// return; +// } +// if(barrier!=null){ +// if(barrier.getType2()==1){ +// open(request,response); +// if(barrier.getType() == 1){ +// int i = Integer.parseInt(redisnum); +// i++; +// redisTemplate.opsForValue().set("car_park_" + park.getId(),Integer.toString(i),30, TimeUnit.DAYS); +// }else if(barrier.getType() == 0){ +// int i = Integer.parseInt(redisnum); +// i--; +// if(i<0){ +// redisTemplate.opsForValue().set("car_park_" + park.getId(),"0",30, TimeUnit.DAYS); +// redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS); +// }else { +// redisTemplate.opsForValue().set("car_park_" + park.getId(),Integer.toString(i),30, TimeUnit.DAYS); +// redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS); +// } +// +// } +// barrier.setType2(0); +// barrier.setUpdateTime(LocalDateTime.now()); +// barrierService.saveOrUpdate(barrier); +// //outLedShowDefault(barrier.getCode(),barrier.getParkId()); +// return; +// } +// barrier.setStatus(0); +// barrier.setUpdateTime(LocalDateTime.now()); +// barrierService.saveOrUpdate(barrier); +// +// OutPark outPark = outParkService.count4(barrier.getId()); +// if(outPark!=null){ +// open(request,response); +// if(barrier.getType() == 0){ +// int i = Integer.parseInt(redisnum); +// i--; +// if(i<0){ +// redisTemplate.opsForValue().set("car_park_" + park.getId(),"0",30, TimeUnit.DAYS); +// redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS); +// }else { +// redisTemplate.opsForValue().set("car_park_" + park.getId(),Integer.toString(i),30, TimeUnit.DAYS); +// redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS); +// } +// } +// outPark.setStatus2(1); +// outParkService.saveOrUpdate(outPark); +// //outLedShowDefault(barrier.getCode(),barrier.getParkId()); +// +// }else{ +// noOpen(request,response); +// } +// } +// } +// /** +// * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response) +// */ +// @PostMapping("/PlateServlet") +// protected void info(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { +// String s= ""; +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss"); +// BufferedReader reader = new BufferedReader(new InputStreamReader(request.getInputStream(),"UTF-8")); +// String str = ""; +// String lineStr = ""; +// while((str = reader.readLine()) != null){ +// lineStr += str; +// } +// System.out.println("鑾峰彇鍒扮殑閬撻椄鎺ㄩ�佹暟鎹负锛�"+lineStr); +// +// JSONObject jsonObject1 = JSON.parseObject(lineStr); +// JSONObject alarmInfoPlate = jsonObject1.getJSONObject("AlarmInfoPlate"); +// JSONObject result = alarmInfoPlate.getJSONObject("result"); +// JSONObject plateResult = result.getJSONObject("PlateResult"); +// String carNo = plateResult.get("license").toString(); +// String code = alarmInfoPlate.get("serialno").toString(); +// +// try { +// JsonParser parser=new JsonParser(); +// do { +// JsonObject jsonObject=(JsonObject) parser.parse(lineStr); +// if( jsonObject == null || jsonObject.isJsonNull() ) { +// break; +// } +// +// JsonObject jsonInfoPlate = jsonObject.get("AlarmInfoPlate").getAsJsonObject(); +// if( jsonInfoPlate == null || jsonInfoPlate.isJsonNull() ) { +// break; +// } +// +// JsonObject jsonResult = jsonInfoPlate.get("result").getAsJsonObject(); +// if( jsonResult == null || jsonResult.isJsonNull() ) { +// break; +// } +// +// JsonObject jsonPlateResult = jsonResult.get("PlateResult").getAsJsonObject(); +// if( jsonPlateResult == null || jsonPlateResult.isJsonNull() ) { +// break; +// } +// +// String license = jsonPlateResult.get("license").getAsString();//杞︾墝鍙� +// if( license == null || license == "") { +// break; +// } +// +// String serialno = jsonInfoPlate.get("serialno").getAsString();//鎽勫儚鏈哄簭鍒楀彿 +// if( serialno == null || serialno == "" ) { +// break; +// } +// +// System.out.println("缂栧彿锛�"+serialno+"璁惧璇嗗埆鍒颁簡锛�"+license); +// String format = sdf.format(new Date()); +// s+= format+",杞︾墝鍙蜂负锛�"+license+",serialno涓猴細"+code+" "; +// +// Barrier barrier = barrierService.findByCode(code); +// System.out.println("鏌ヨ鍒伴亾闂镐负锛�"+barrier); +// if(barrier==null){ +// s+="鏌ヨ閬撻椄涓虹┖\n"; +// }else{ +// if(barrier.getType()==0){ +// //noOpen(request,response); +// outPark(license, barrier.getId(), barrier.getParkId()); +// s+=license+"-淇濆瓨鍑哄満璁板綍\n"; +// }else{ +// String num = redisTemplate.opsForValue().get("car_park_" + barrier.getParkId()); +// if(StringUtils.isBlank(num)){ +// num = "0"; +// redisTemplate.opsForValue().set("car_park_" + barrier.getParkId(),num,30, TimeUnit.DAYS); +// redisTemplate.opsForValue().set("park_up_" + barrier.getParkId(),"true",30, TimeUnit.DAYS); +// } +// Park byId = parkService.getById(barrier.getParkId()); +// if(Integer.parseInt(num) >= byId.getNum() ){ +// //led鏄剧ず +// Boolean aBoolean = inLedFullShow(code, license,barrier.getParkId()); +// noOpen(request,response); +// }else { +// //led鏄剧ず +// Boolean aBoolean = inLedShow(code, license,barrier.getParkId()); +// if(aBoolean){ +// //鍏ュ満鎶潌 +// open(request, response); +// enterPark(license,barrier.getId(),barrier.getParkId()); +// s+=license+"-淇濆瓨鍏ュ満璁板綍\n"; +// } +// } +// } +// } +// writeTxt(s); +// }while(false); +// } +// catch (Exception e) { +// System.out.println("鏃犲叆鍦鸿褰�"); +// s+=" ,鏌ヨ鍦哄唴璁板綍寮傚父"; +// writeTxt(s); +// } +// } +// +// +// private void writeTxt( String txt) +// { +// SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); +// try +// { +// FileWriter f = new FileWriter(systemConfigProperties.getLogPath()+sdf.format(new Date())+".txt",true); +// BufferedWriter bw=new BufferedWriter(f); +// bw.write(txt); +// bw.newLine(); +// bw.close(); +// } +// catch(Exception e) +// { +// System.out.println("鎵撳嵃閿欒"); +// } +// } +// +// +// +// +// public void enterPark(String carNo,Integer barrierId,Integer parkId) { +// Park park = parkService.getById(parkId); +// int num = 0; +// String s = redisTemplate.opsForValue().get("car_park_" + parkId); +// if(park != null){ +// num = park.getNum(); +// if(s !=null){ +// if(Integer.parseInt(s) >= num){ +// redisTemplate.opsForValue().set("park_up_" + parkId,"false",30, TimeUnit.DAYS); +// return; +// } +// }else { +// s= "0"; +// redisTemplate.opsForValue().set("car_park_" + parkId,s,30, TimeUnit.DAYS); +// redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS); +// } +// } +// enterParkService.deleteByCarNo(carNo,parkId); +// EnterPark enterPark = new EnterPark(); +// enterPark.setCarNo(carNo); +// enterPark.setBarrierId(barrierId); +// enterPark.setParkId(parkId); +// +// QueryWrapper<Ticket> wrapper = new QueryWrapper<>(); +// wrapper.lambda() +// .eq(Ticket::getCarNo,enterPark.getCarNo()) +// .eq(Ticket::getPayStatus,1); +// List<Ticket> tickets = ticketService.list(wrapper); +// if(tickets.size()>0){ +// enterPark.setStatus(1);//鍙戠幇鏈夎繚绔� +// } +// enterParkService.saveOrUpdate(enterPark); +// +// Barrier barrier = barrierService.getById(barrierId); +// barrier.setType2(1); +// barrierService.saveOrUpdate(barrier); +// } +// +// public double outPark(String carNo,Integer barrierId,Integer parkId) { +// double money = 0.0; +// EnterPark enterPark = null; +// String toDayHrMinSec = null; +// OutPark outPark = new OutPark(); +// outPark.setCarNo(carNo); +// outPark.setParkId(parkId); +// outPark.setBarrierId(barrierId); +// outPark.setCreateTime(LocalDateTime.now()); +// outPark.setCode(System.currentTimeMillis()+""); +// List<EnterPark> byCarNo = enterParkService.findByCarNo(carNo,parkId); +// +// if(byCarNo.size() == 0){ +// System.out.println(carNo+"鏈彂鐜板満鍐呰溅杈�"); +// }else{ +// enterPark = byCarNo.get(0); +// System.out.println("鍏ュ満璁板綍锛�"+enterPark); +// outPark.setEnterTime(enterPark.getCreateTime()); +// try { +// long l = outPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli() - enterPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli(); +// outPark.setTime(l/(1000*60)); +// toDayHrMinSec = DateUtilOther.millisToDayHrMinSec(l/(1000*60)); +// money = costRuleService.getMoney(parkId, outPark.getEnterTime(), outPark.getCreateTime(), 1); +// } catch (ParseException e) { +// e.printStackTrace(); +// } +// +// } +// //outPark.setPrice(Double.valueOf(String.format("%.1f", money))); +// outPark.setPrice(money); +// outPark.setStatus3(findTicket(carNo)); +// outParkService.saveOrUpdate(outPark); +// Barrier barrier =barrierService.getById(barrierId); +// barrier.setCarNo(carNo); +// //led灞曠ず +// if(toDayHrMinSec == null){ +// toDayHrMinSec = "涓嶈冻涓ゅ皬鏃�"; +// } +// //鍒ゆ柇鏄惁鍦ㄧ櫧鍚嶅崟 +// QueryWrapper<WhiteList> wrapper = new QueryWrapper<>(); +// wrapper.lambda() +// .eq(WhiteList::getCarNo,carNo); +// List<WhiteList> all = whiteListService.list(wrapper); +// if(all.size() >0){ +// for(WhiteList w : all){ +// if(w.getType()==0){ +// outLedShow2(barrier.getCode(),barrier.getCarNo(),"鏈堢杞�",toDayHrMinSec,barrier.getParkId()); +// barrier.setType2(1); +// barrierService.saveOrUpdate(barrier); +// OutPark byCarNoAndBarrierId = outParkService.findByCarNoAndBarrierId(carNo, barrierId); +// byCarNoAndBarrierId.setStatus(1); +// outParkService.saveOrUpdate(byCarNoAndBarrierId); +// return 0.0; +// }else{ +// if(w.getParkIds()!=null){ +// if(w.getEndTime()!=null){ +// String parkIds = w.getParkIds(); +// String[] split = parkIds.split(","); +// for (String s : split) { +// int pid = Integer.parseInt(s); +// if(pid == outPark.getParkId() && System.currentTimeMillis()<w.getEndTime().getTime()){ +// outLedShow2(barrier.getCode(),barrier.getCarNo(),"鏈堢杞�",toDayHrMinSec,barrier.getParkId()); +// barrier.setType2(1); +// barrierService.saveOrUpdate(barrier); +// OutPark byCarNoAndBarrierId = outParkService.findByCarNoAndBarrierId(carNo, barrierId); +// byCarNoAndBarrierId.setStatus(1); +// outParkService.saveOrUpdate(byCarNoAndBarrierId); +// return 0.0; +// } +// } +// } +// } +// } +// } +// } +// outLedShow(barrier.getCode(),barrier.getCarNo(),outPark.getPrice(),toDayHrMinSec,barrier.getParkId()); +// if(outPark.getPrice()==0&&outPark.getStatus3()==0){ +// System.out.println(outPark.getCarNo()+"璇ヨ溅涓嶉渶瑕佺即璐�"); +// barrier.setType2(1); +// } +// barrierService.saveOrUpdate(barrier); +// return money; +// } +// +// public int findTicket(String carNo){ +// QueryWrapper<Ticket> wrapper = new QueryWrapper<>(); +// wrapper.lambda() +// .eq(Ticket::getCarNo,carNo) +// .eq(Ticket::getPayStatus,1); +// List<Ticket> tickets = ticketService.list(wrapper); +// if(tickets.size()>0){ +// return 1; +// }else{ +// return 0; +// } +// } +// +// public Boolean inLedShow(String ledId,String carNo,Integer parkId){ +// String num = redisTemplate.opsForValue().get("car_park_" + parkId); +// Park byId = parkService.getById(parkId); +// int i = byId.getNum() - Integer.parseInt(num); +// if(i<0){ +// i = 0; +// } +// String carType = ""; +// String carDay = ""; +// Barrier barrier = barrierService.findByCode(ledId); +// WhiteList byCarNo = whiteListService.getByCarNo(carNo); +// if(byCarNo == null){ +// carType = "涓存椂杞�"; +// }else { +// if (byCarNo.getType() == 0){ +// //鐧藉悕鍗曟案涔呰溅杈� +// carType = "鏈堢杞�"; +// }else { +// //鐧藉悕鍗曞浐瀹氬仠杞﹀満杞﹁締 +// if(byCarNo.getParkId().equals(barrier.getParkId())){ +// carType = "鏈堢杞�"; +// long l = (byCarNo.getEndTime().getTime() - byCarNo.getStartTime().getTime()) / (24 * 3600 * 1000); +// carDay = "鏈夋晥鏈熻繕鏈�"+l+"澶�"; +// } +// } +// } +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); +// LedShow ledShow = new LedShow(); +// ledShow.setLedId(ledId); +// ledShow.setNumber(parkId); +// ledShow.setStatus(1); +// ledShow.setType(2); +// ledShow.setName(barrier.getName()); +// ledShow.setIsDefault(1); +// ledShow.setPassword("boying_ffpark"); +// ledShow.setTimeStamp(sdf.format(new Date())); +// ledShow.setColor1(1); +// ledShow.setColor2(2); +// ledShow.setColor3(1); +// ledShow.setColor4(2); +// ledShow.setContent1(carNo); +// ledShow.setContent2(carType); +// ledShow.setContent3("杞︿綅鍓╀綑锛�"+i); +// ledShow.setContent4(carDay); +// ledShow.setDisMode1(0); +// ledShow.setDisMode2(0); +// ledShow.setDisMode3(1); +// ledShow.setDisMode4(1); +// ledShow.setStatus1(0); +// ledShow.setStatus2(0); +// ledShow.setStatus3(0); +// ledShow.setStatus4(0); +// if(barrier.getIpAddress() != null){ +// ledShow.setIpAddress(barrier.getIpAddress()); +// } +// if(barrier.getPort() != 0){ +// ledShow.setPort(barrier.getPort()); +// } +// ledShow.setVoiceContent(carNo+carType+"娆㈣繋杩涘満"); +// return ledShowService.save(ledShow); +// } +// +// public Boolean inLedFullShow(String ledId, String carNo, Integer parkId){ +// String carType = ""; +// String carDay = ""; +// Barrier barrier = barrierService.findByCode(ledId); +// WhiteList byCarNo = whiteListService.getByCarNo(carNo); +// if(byCarNo == null){ +// carType = "涓存椂杞�"; +// }else { +// if (byCarNo.getType() == 0){ +// //鐧藉悕鍗曟案涔呰溅杈� +// carType = "鏈堢杞�"; +// }else { +// //鐧藉悕鍗曞浐瀹氬仠杞﹀満杞﹁締 +// if(byCarNo.getParkId().equals(barrier.getParkId())){ +// carType = "鏈堢杞�"; +// long l = (byCarNo.getEndTime().getTime() - byCarNo.getStartTime().getTime()) / (24 * 3600 * 1000); +// carDay = "鏈夋晥鏈熻繕鏈�"+l+"澶�"; +// } +// } +// } +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); +// LedShow ledShow = new LedShow(); +// ledShow.setLedId(ledId); +// ledShow.setNumber(parkId); +// ledShow.setStatus(1); +// ledShow.setType(2); +// ledShow.setName(barrier.getName()); +// ledShow.setIsDefault(1); +// ledShow.setPassword("boying_ffpark"); +// ledShow.setTimeStamp(sdf.format(new Date())); +// ledShow.setColor1(1); +// ledShow.setColor2(2); +// ledShow.setColor3(1); +// ledShow.setColor4(2); +// ledShow.setContent1(carNo); +// ledShow.setContent2(carType); +// ledShow.setContent3("杞︿綅宸叉弧"); +// ledShow.setContent4("璇烽┒绂�"); +// ledShow.setDisMode1(0); +// ledShow.setDisMode2(0); +// ledShow.setDisMode3(1); +// ledShow.setDisMode4(1); +// ledShow.setStatus1(0); +// ledShow.setStatus2(0); +// ledShow.setStatus3(0); +// ledShow.setStatus4(0); +// if(barrier.getIpAddress() != null){ +// ledShow.setIpAddress(barrier.getIpAddress()); +// } +// if(barrier.getPort() != 0){ +// ledShow.setPort(barrier.getPort()); +// } +// ledShow.setVoiceContent("杞︿綅宸叉弧璇烽┒绂�"); +// return ledShowService.save(ledShow); +// } +// +// public Boolean outLedShow(String ledId,String carNo,Double price,String timeStamp,Integer parkId){ +// Barrier barrier = barrierService.findByCode(ledId); +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); +// LedShow ledShow = new LedShow(); +// ledShow.setLedId(ledId); +// ledShow.setNumber(parkId); +// ledShow.setStatus(1); +// ledShow.setType(2); +// ledShow.setName(barrier.getName()); +// ledShow.setIsDefault(1); +// ledShow.setPassword("boying_ffpark"); +// ledShow.setTimeStamp(sdf.format(new Date())); +// ledShow.setColor1(1); +// ledShow.setColor2(2); +// ledShow.setColor3(1); +// ledShow.setColor4(2); +// ledShow.setContent1(carNo); +// ledShow.setContent2("鍋滆溅"+timeStamp); +// ledShow.setContent3("浜よ垂"+price+"鍏�"); +// ledShow.setContent4("绂佹闂潌"); +// ledShow.setDisMode1(0); +// ledShow.setDisMode2(1); +// ledShow.setDisMode3(1); +// ledShow.setDisMode4(0); +// ledShow.setStatus1(0); +// ledShow.setStatus2(0); +// ledShow.setStatus3(0); +// ledShow.setStatus4(0); +// if(barrier.getIpAddress() != null){ +// ledShow.setIpAddress(barrier.getIpAddress()); +// } +// if(barrier.getPort() != 0){ +// ledShow.setPort(barrier.getPort()); +// } +// ledShow.setVoiceContent(carNo+"鍋滆溅"+timeStamp+"浜よ垂"+price+"鍏�"); +// return ledShowService.save(ledShow); +// } +// +// public Boolean outLedShow2(String ledId,String carNo,String text,String timeStamp,Integer parkId){ +// Barrier barrier = barrierService.findByCode(ledId); +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); +// LedShow ledShow = new LedShow(); +// ledShow.setLedId(ledId); +// ledShow.setNumber(parkId); +// ledShow.setStatus(1); +// ledShow.setType(2); +// ledShow.setName(barrier.getName()); +// ledShow.setIsDefault(1); +// ledShow.setPassword("boying_ffpark"); +// ledShow.setTimeStamp(sdf.format(new Date())); +// ledShow.setColor1(1); +// ledShow.setColor2(2); +// ledShow.setColor3(1); +// ledShow.setColor4(2); +// ledShow.setContent1(carNo); +// ledShow.setContent2("鍋滆溅"+timeStamp); +// ledShow.setContent3(text); +// ledShow.setContent4("绂佹闂潌"); +// ledShow.setDisMode1(0); +// ledShow.setDisMode2(1); +// ledShow.setDisMode3(1); +// ledShow.setDisMode4(0); +// ledShow.setStatus1(0); +// ledShow.setStatus2(0); +// ledShow.setStatus3(0); +// ledShow.setStatus4(0); +// if(barrier.getIpAddress() != null){ +// ledShow.setIpAddress(barrier.getIpAddress()); +// } +// if(barrier.getPort() != 0){ +// ledShow.setPort(barrier.getPort()); +// } +// ledShow.setVoiceContent(carNo+"鍋滆溅"+timeStamp); +// return ledShowService.save(ledShow); +// } +// +// public Boolean outLedShowDefault(String ledId,Integer parkId){ +// Barrier barrier = barrierService.findByCode(ledId); +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); +// LedShow ledShow = new LedShow(); +// ledShow.setLedId(ledId); +// ledShow.setNumber(parkId); +// ledShow.setStatus(1); +// ledShow.setType(2); +// ledShow.setName(barrier.getName()); +// ledShow.setIsDefault(1); +// ledShow.setPassword("boying_ffpark"); +// ledShow.setTimeStamp(sdf.format(new Date())); +// ledShow.setColor1(1); +// ledShow.setColor2(1); +// ledShow.setColor3(1); +// ledShow.setColor4(1); +// ledShow.setContent1("娆㈣繋鍏変复"); +// ledShow.setContent2("涓�杞︿竴鏉�"); +// ledShow.setContent3("鍑忛�熸參琛�"); +// ledShow.setContent4("瀹夊叏琛岄┒"); +// ledShow.setDisMode1(0); +// ledShow.setDisMode2(0); +// ledShow.setDisMode3(0); +// ledShow.setDisMode4(0); +// ledShow.setStatus1(0); +// ledShow.setStatus2(0); +// ledShow.setStatus3(0); +// ledShow.setStatus4(0); +// if(barrier.getIpAddress() != null){ +// ledShow.setIpAddress(barrier.getIpAddress()); +// } +// if(barrier.getPort() != 0){ +// ledShow.setPort(barrier.getPort()); +// } +// ledShow.setVoiceContent(""); +// return ledShowService.save(ledShow); +// } +// +//} -- Gitblit v1.9.1