java110-db/src/main/resources/mapper/common/MachineTranslateV1ServiceDaoImplMapper.xml
@@ -174,8 +174,8 @@ select max(t.machine_translate_id) machineTranslateId from machine_translate t where t.status_cd = '0' and t.obj_id in <foreach collection="objIds" item="item" open="(" close=")" separator=","> <foreach collection="objIds" item="item" open="and t.obj_id in (" close=")" separator=","> #{item} </foreach> <if test="communityId !=null and communityId != ''"> java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml
@@ -159,14 +159,13 @@ </foreach> </if> <if test="psIds != null and psIds != null"> and t.ps_id in <foreach collection="psIds" item="item" open="(" close=")" separator=","> <foreach collection="psIds" item="item" open="and t.ps_id in (" close=")" separator=","> #{item} </foreach> </if> <if test="paIds != null "> and t.pa_id in <foreach collection="paIds" item="item" open="(" close=")" separator=","> <foreach collection="paIds" item="item" open="and t.pa_id in (" close=")" separator=","> #{item} </foreach> </if> @@ -176,11 +175,11 @@ <if test="bId !=null and bId != ''"> and t.b_id= #{bId} </if> </where> order by t.create_time desc <if test="page != -1 and page != null "> limit #{page}, #{row} </if> </where> </select> <!-- 修改停车位信息 add by wuxw 2018-07-03 --> java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
@@ -372,6 +372,9 @@ <if test="idCard !=null and idCard != ''"> , t.id_card = #{idCard} </if> <if test="personRole !=null and personRole != ''"> , t.personRole = #{personRole} </if> where 1=1 <if test="bId !=null and bId != ''"> and t.b_id= #{bId} service-acct/src/main/java/com/java110/acct/cmd/account/QueryCommunityOwnerAccountCmd.java
@@ -86,6 +86,8 @@ ownerDto.setCommunityId(reqJson.getString("communityId")); ownerDto.setLink(reqJson.getString("link")); ownerDto.setIdCard(reqJson.getString("idCard")); ownerDto.setName(reqJson.getString("ownerName")); accountDto.setAcctName(ownerDto.getName()); ResponseEntity<String> responseEntity = getAccountBMOImpl.queryOwnerAccount(accountDto, ownerDto); context.setResponseEntity(responseEntity); } service-api/src/main/java/com/java110/api/configuration/ServiceConfiguration.java
@@ -26,6 +26,7 @@ @Bean public FilterRegistrationBean jwtFilter() { StringBuffer exclusions = new StringBuffer(); exclusions.append("/app/carInout.*,"); exclusions.append("/callComponent/login/*,"); exclusions.append("/secondaryFeeTypeCdGl/*,"); exclusions.append("/app/ext/992020051967020024/query_token,"); service-api/src/main/java/com/java110/api/smo/login/impl/WxLoginSMOImpl.java
@@ -111,6 +111,7 @@ paramOut.put("openId", openId); paramOut.put("sessionKey", sessionKey); paramOut.put("msg", "还没有注册请先注册"); paramOut.put("code", "401"); responseEntity = new ResponseEntity<String>(paramOut.toJSONString(), HttpStatus.UNAUTHORIZED); return responseEntity; service-common/src/main/java/com/java110/common/cmd/carInout/SaveCarInoutCmd.java
@@ -77,6 +77,7 @@ Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId"); if (reqJson.containsKey("exit_time")) { reqJson.put("outTime", reqJson.getString("exit_time")); reqJson.put("state" , "100500"); }else { reqJson.put("state" , "100300"); @@ -87,23 +88,111 @@ @Override @Java110Transactional public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException { if(reqJson.containsKey("exit_time")){//出口 if(reqJson.get("paid_status").equals("true")){//已收取现金 CarInoutPo carInoutPo = BeanConvertUtil.covertBean(reqJson, CarInoutPo.class); carInoutPo.setInoutId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID)); int flag = carInoutV1InnerServiceSMOImpl.saveCarInout(carInoutPo); CarInoutPo carInoutPo = BeanConvertUtil.covertBean(reqJson, CarInoutPo.class); carInoutPo.setInoutId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID)); int flag = carInoutV1InnerServiceSMOImpl.saveCarInout(carInoutPo); if (flag < 1) { throw new CmdException("保存数据失败"); } JSONObject jsonObject = new JSONObject(); jsonObject.put("allow_exit", "true"); jsonObject.put("message","允许通行"); jsonObject.put("payment_required","true"); jsonObject.put("amount_due",reqJson.get("payment_amount")); ResponseEntity<String> responseEntity = ResponseEntity .ok() .header("Content-Type", "application/json") .body(jsonObject.toString()); // 关键：用toString()返回原始JSON字符串 if (flag < 1) { throw new CmdException("保存数据失败"); cmdDataFlowContext.setResponseEntity(responseEntity); } else if(reqJson.get("vehicle_type").equals("monthly")){ if(reqJson.get("paid_status").equals("false")){ JSONObject jsonObject = new JSONObject(); jsonObject.put("allow_exit", "false"); jsonObject.put("message","租车费用未结清，请补缴后通行"); jsonObject.put("payment_required","false"); jsonObject.put("amount_due",reqJson.get("payment_amount")); ResponseEntity<String> responseEntity = ResponseEntity .ok() .header("Content-Type", "application/json") .body(jsonObject.toString()); // 关键：用toString()返回原始JSON字符串 cmdDataFlowContext.setResponseEntity(responseEntity); }else{ CarInoutPo carInoutPo = BeanConvertUtil.covertBean(reqJson, CarInoutPo.class); carInoutPo.setInoutId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID)); int flag = carInoutV1InnerServiceSMOImpl.saveCarInout(carInoutPo); if (flag < 1) { throw new CmdException("保存数据失败"); } JSONObject jsonObject = new JSONObject(); jsonObject.put("allow_exit", "true"); jsonObject.put("message","允许通行"); jsonObject.put("payment_required","true"); jsonObject.put("amount_due","0"); ResponseEntity<String> responseEntity = ResponseEntity .ok() .header("Content-Type", "application/json") .body(jsonObject.toString()); // 关键：用toString()返回原始JSON字符串 cmdDataFlowContext.setResponseEntity(responseEntity); } } else if(1 == 1){//如果不能直接支付 JSONObject jsonObject = new JSONObject(); jsonObject.put("allow_exit", "false"); jsonObject.put("message","请支付金额"+reqJson.get("payment_amount")); jsonObject.put("payment_required","false"); jsonObject.put("amount_due",reqJson.get("payment_amount")); ResponseEntity<String> responseEntity = ResponseEntity .ok() .header("Content-Type", "application/json") .body(jsonObject.toString()); // 关键：用toString()返回原始JSON字符串 cmdDataFlowContext.setResponseEntity(responseEntity); }else{//能直接支付 CarInoutPo carInoutPo = BeanConvertUtil.covertBean(reqJson, CarInoutPo.class); carInoutPo.setInoutId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID)); int flag = carInoutV1InnerServiceSMOImpl.saveCarInout(carInoutPo); if (flag < 1) { throw new CmdException("保存数据失败"); } JSONObject jsonObject = new JSONObject(); jsonObject.put("allow_exit", "true"); jsonObject.put("message","允许通行"); jsonObject.put("payment_required","true"); jsonObject.put("amount_due",reqJson.get("payment_amount")); ResponseEntity<String> responseEntity = ResponseEntity .ok() .header("Content-Type", "application/json") .body(jsonObject.toString()); // 关键：用toString()返回原始JSON字符串 cmdDataFlowContext.setResponseEntity(responseEntity); } }else{//进口 CarInoutPo carInoutPo = BeanConvertUtil.covertBean(reqJson, CarInoutPo.class); carInoutPo.setInoutId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID)); int flag = carInoutV1InnerServiceSMOImpl.saveCarInout(carInoutPo); if (flag < 1) { throw new CmdException("保存数据失败"); } JSONObject jsonObject = new JSONObject(); jsonObject.put("allow_entry","true"); jsonObject.put("message","允许通行"); jsonObject.put("expire_date","");// 如果是包月车，返回有效期 ResponseEntity<String> responseEntity = ResponseEntity .ok() .header("Content-Type", "application/json") .body(jsonObject.toString()); // 关键：用toString()返回原始JSON字符串 cmdDataFlowContext.setResponseEntity(responseEntity); } JSONObject jsonObject = new JSONObject(); jsonObject.put("allow_entry","true"); jsonObject.put("message","允许通行"); jsonObject.put("expire_date","");// 如果是包月车，返回有效期 ResponseEntity<String> responseEntity = ResponseEntity .ok() .header("Content-Type", "application/json") .body(jsonObject.toString()); // 关键：用toString()返回原始JSON字符串 cmdDataFlowContext.setResponseEntity(responseEntity); } } service-common/src/main/java/com/java110/common/cmd/carInout/SaveCarInoutsCmd.java
New file @@ -0,0 +1,195 @@ /* * Copyright 2017-2020 吴学文 and java110 team. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package com.java110.common.cmd.carInout; import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; import com.java110.core.annotation.Java110Transactional; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.core.log.LoggerFactory; import com.java110.dto.community.CommunityDto; import com.java110.intf.common.ICarInoutV1InnerServiceSMO; import com.java110.intf.community.ICommunityInnerServiceSMO; import com.java110.po.car.CarInoutPo; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import java.util.List; /** * 类表述：保存 * 服务编码：carInout.saveCarInout * 请求路劲：/app/carInout.SaveCarInout * add by 吴学文 at 2021-10-13 14:45:52 mail: 928255095@qq.com * open source address: https://gitee.com/wuxw7/MicroCommunity * 官网：http://www.homecommunity.cn * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下 * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行 */ @Java110Cmd(serviceCode = "carInout.saveCarInoutBatch") public class SaveCarInoutsCmd extends Cmd { private static Logger logger = LoggerFactory.getLogger(SaveCarInoutsCmd.class); public static final String CODE_PREFIX_ID = "10"; @Autowired private ICarInoutV1InnerServiceSMO carInoutV1InnerServiceSMOImpl; @Autowired private ICommunityInnerServiceSMO communityInnerServiceSMOImpl; @Override public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) { Assert.hasKeyAndValue(reqJson, "community_name", "请求报文中未包含小区名称"); Assert.hasKeyAndValue(reqJson, "plate_number", "请求报文中未包含车牌号"); Assert.hasKeyAndValue(reqJson, "entry_time", "请求报文中未包含进场时间"); CommunityDto communityDto = new CommunityDto(); communityDto.setName(reqJson.getString("community_name")); List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto); if (!(communityDtos == null || communityDtos.size() == 0)) { reqJson.put("communityId",communityDtos.get(0).getCommunityId()); } reqJson.put("carNum", reqJson.getString("plate_number")); Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId"); if (reqJson.containsKey("exit_time")) { reqJson.put("outTime", reqJson.getString("exit_time")); reqJson.put("state" , "100500"); }else { reqJson.put("state" , "100300"); } reqJson.put("inTime", reqJson.getString("entry_time")); } @Override @Java110Transactional public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException { if(reqJson.containsKey("exit_time")){//出口 if(reqJson.get("paid_status").equals("true")){//已收取现金 CarInoutPo carInoutPo = BeanConvertUtil.covertBean(reqJson, CarInoutPo.class); carInoutPo.setInoutId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID)); int flag = carInoutV1InnerServiceSMOImpl.saveCarInout(carInoutPo); if (flag < 1) { throw new CmdException("保存数据失败"); } JSONObject jsonObject = new JSONObject(); jsonObject.put("allow_exit", "true"); jsonObject.put("message","允许通行"); jsonObject.put("payment_required","true"); jsonObject.put("amount_due",reqJson.get("payment_amount")); ResponseEntity<String> responseEntity = ResponseEntity .ok() .header("Content-Type", "application/json") .body(jsonObject.toString()); // 关键：用toString()返回原始JSON字符串 cmdDataFlowContext.setResponseEntity(responseEntity); } else if(reqJson.get("vehicle_type").equals("monthly")){ if(reqJson.get("paid_status").equals("false")){ JSONObject jsonObject = new JSONObject(); jsonObject.put("allow_exit", "false"); jsonObject.put("message","租车费用未结清，请补缴后通行"); jsonObject.put("payment_required","false"); jsonObject.put("amount_due",reqJson.get("payment_amount")); ResponseEntity<String> responseEntity = ResponseEntity .ok() .header("Content-Type", "application/json") .body(jsonObject.toString()); // 关键：用toString()返回原始JSON字符串 cmdDataFlowContext.setResponseEntity(responseEntity); }else{ CarInoutPo carInoutPo = BeanConvertUtil.covertBean(reqJson, CarInoutPo.class); carInoutPo.setInoutId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID)); int flag = carInoutV1InnerServiceSMOImpl.saveCarInout(carInoutPo); if (flag < 1) { throw new CmdException("保存数据失败"); } JSONObject jsonObject = new JSONObject(); jsonObject.put("allow_exit", "true"); jsonObject.put("message","允许通行"); jsonObject.put("payment_required","true"); jsonObject.put("amount_due","0"); ResponseEntity<String> responseEntity = ResponseEntity .ok() .header("Content-Type", "application/json") .body(jsonObject.toString()); // 关键：用toString()返回原始JSON字符串 cmdDataFlowContext.setResponseEntity(responseEntity); } } else if(1 == 1){//如果不能直接支付 JSONObject jsonObject = new JSONObject(); jsonObject.put("allow_exit", "false"); jsonObject.put("message","请支付金额"+reqJson.get("payment_amount")); jsonObject.put("payment_required","false"); jsonObject.put("amount_due",reqJson.get("payment_amount")); ResponseEntity<String> responseEntity = ResponseEntity .ok() .header("Content-Type", "application/json") .body(jsonObject.toString()); // 关键：用toString()返回原始JSON字符串 cmdDataFlowContext.setResponseEntity(responseEntity); }else{//能直接支付 CarInoutPo carInoutPo = BeanConvertUtil.covertBean(reqJson, CarInoutPo.class); carInoutPo.setInoutId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID)); int flag = carInoutV1InnerServiceSMOImpl.saveCarInout(carInoutPo); if (flag < 1) { throw new CmdException("保存数据失败"); } JSONObject jsonObject = new JSONObject(); jsonObject.put("allow_exit", "true"); jsonObject.put("message","允许通行"); jsonObject.put("payment_required","true"); jsonObject.put("amount_due",reqJson.get("payment_amount")); ResponseEntity<String> responseEntity = ResponseEntity .ok() .header("Content-Type", "application/json") .body(jsonObject.toString()); // 关键：用toString()返回原始JSON字符串 cmdDataFlowContext.setResponseEntity(responseEntity); } }else{//进口 CarInoutPo carInoutPo = BeanConvertUtil.covertBean(reqJson, CarInoutPo.class); carInoutPo.setInoutId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID)); int flag = carInoutV1InnerServiceSMOImpl.saveCarInout(carInoutPo); if (flag < 1) { throw new CmdException("保存数据失败"); } JSONObject jsonObject = new JSONObject(); jsonObject.put("allow_entry","true"); jsonObject.put("message","允许通行"); jsonObject.put("expire_date","");// 如果是包月车，返回有效期 ResponseEntity<String> responseEntity = ResponseEntity .ok() .header("Content-Type", "application/json") .body(jsonObject.toString()); // 关键：用toString()返回原始JSON字符串 cmdDataFlowContext.setResponseEntity(responseEntity); } } } service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerMemberCmd.java
@@ -126,6 +126,7 @@ @Override public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException { Assert.hasKeyAndValue(reqJson, "link", "请求报文中未包含link"); Assert.jsonObjectHaveKey(reqJson, "name", "请求报文中未包含name"); Assert.jsonObjectHaveKey(reqJson, "sex", "请求报文中未包含sex"); springboot/src/main/resources/application.yml
@@ -1,6 +1,6 @@ spring: profiles: active: dev active: devlocal # docker build -t lx .
