1、优化采购批次相关内容2、优化访客停车白名单下发3、新增权限组排序4、优化设备相关5、优化页面相关展示bug

java110-db/src/main/resources/mapper/user/UserV1ServiceDaoImplMapper.xml

@@ -7,11 +7,9 @@
 
     <!-- 保存用户信息 add by wuxw 2018-07-03 -->
     <insert id="saveUserInfo" parameterType="Map">
-        insert into u_user(
-        address,sex,user_id,level_cd,location_cd,score,password,name,tel,b_id,email,age
-        ) values (
-        #{address},#{sex},#{userId},#{levelCd},#{locationCd},#{score},#{password},#{name},#{tel},#{bId},#{email},#{age}
-        )
+        insert into u_user(address, sex, user_id, level_cd, location_cd, score, password, name, tel, b_id, email, age)
+        values (#{address}, #{sex}, #{userId}, #{levelCd}, #{locationCd}, #{score}, #{password}, #{name}, #{tel},
+                #{bId}, #{email}, #{age})
     </insert>
 
 
@@ -98,9 +96,7 @@
         <if test="tel !=null and tel != ''">
             , t.tel= #{tel}
         </if>
-        <if test="email !=null and email != ''">
-            , t.email= #{email}
-        </if>
+        , t.email= #{email}
         <if test="age !=null and age != ''">
             , t.age= #{age}
         </if>
@@ -183,8 +179,10 @@
     </select>
 
     <select id="queryStaffsNoInOrg" parameterType="Map" resultType="Map">
-        select DISTINCT t.address,t.sex,t.status_cd,t.status_cd statusCd,t.user_id,t.user_id userId,t.level_cd,t.level_cd
-        levelCd,t.location_cd,t.location_cd locationCd,t.score,t.name,t.tel,t.b_id,t.b_id bId,t.email,t.age,t.create_time
+        select DISTINCT t.address,t.sex,t.status_cd,t.status_cd statusCd,t.user_id,t.user_id
+        userId,t.level_cd,t.level_cd
+        levelCd,t.location_cd,t.location_cd locationCd,t.score,t.name,t.tel,t.b_id,t.b_id
+        bId,t.email,t.age,t.create_time
         from u_user t
         inner join s_store_user su on t.user_id = su.user_id and su.status_cd = '0'
         LEFT JOIN u_org_staff_rel osr on su.user_id = osr.staff_id and osr.status_cd = '0'

service-store/src/main/java/com/java110/store/cmd/scheduleClasses/DeleteScheduleClassesCmd.java

@@ -21,8 +21,10 @@ 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.dto.scheduleClasses.ScheduleClassesDto;
+import com.java110.dto.scheduleClassesDay.ScheduleClassesDayDto;
 import com.java110.dto.scheduleClassesStaff.ScheduleClassesStaffDto;
+import com.java110.dto.scheduleClassesTime.ScheduleClassesTimeDto;
 import com.java110.intf.store.IScheduleClassesDayV1InnerServiceSMO;
 import com.java110.intf.store.IScheduleClassesStaffV1InnerServiceSMO;
 import com.java110.intf.store.IScheduleClassesTimeV1InnerServiceSMO;
@@ -38,6 +40,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 /**
  * 类表述：删除
  * 服务编码：scheduleClasses.deleteScheduleClasses
@@ -64,48 +68,52 @@ public class DeleteScheduleClassesCmd extends Cmd {
     @Autowired
     private IScheduleClassesStaffV1InnerServiceSMO scheduleClassesStaffV1InnerServiceSMOImpl;
 
-
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "scheduleId", "scheduleId不能为空");
-
         ScheduleClassesStaffDto scheduleClassesStaffDto = new ScheduleClassesStaffDto();
         scheduleClassesStaffDto.setScheduleId(reqJson.getString("scheduleId"));
         int count = scheduleClassesStaffV1InnerServiceSMOImpl.queryScheduleClassesStaffsCount(scheduleClassesStaffDto);
-        if(count> 0){
+        if (count > 0) {
             throw new CmdException("请先解除人员再删除");
         }
-
     }
 
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
+        ScheduleClassesDto scheduleClassesDto = new ScheduleClassesDto();
+        scheduleClassesDto.setScheduleId(reqJson.getString("scheduleId"));
+        List<ScheduleClassesDto> scheduleClassesDtos = scheduleClassesV1InnerServiceSMOImpl.queryScheduleClassess(scheduleClassesDto);
+        Assert.listOnlyOne(scheduleClassesDtos, "查询排班信息错误！");
         ScheduleClassesPo scheduleClassesPo = BeanConvertUtil.covertBean(reqJson, ScheduleClassesPo.class);
         int flag = scheduleClassesV1InnerServiceSMOImpl.deleteScheduleClasses(scheduleClassesPo);
-
         if (flag < 1) {
             throw new CmdException("删除数据失败");
         }
-
-        ScheduleClassesDayPo scheduleClassesDayPo = new ScheduleClassesDayPo();
-        scheduleClassesDayPo.setScheduleId(scheduleClassesPo.getScheduleId());
-        flag = scheduleClassesDayV1InnerServiceSMOImpl.deleteScheduleClassesDay(scheduleClassesDayPo);
-
-        if (flag < 1) {
-            throw new CmdException("更新数据失败");
+        ScheduleClassesDayDto scheduleClassesDayDto = new ScheduleClassesDayDto();
+        scheduleClassesDayDto.setScheduleId(scheduleClassesDtos.get(0).getScheduleId());
+        List<ScheduleClassesDayDto> scheduleClassesDayDtos = scheduleClassesDayV1InnerServiceSMOImpl.queryScheduleClassesDays(scheduleClassesDayDto);
+        if (scheduleClassesDayDtos != null && scheduleClassesDayDtos.size() == 1) {
+            ScheduleClassesDayPo scheduleClassesDayPo = new ScheduleClassesDayPo();
+            scheduleClassesDayPo.setScheduleId(scheduleClassesPo.getScheduleId());
+            flag = scheduleClassesDayV1InnerServiceSMOImpl.deleteScheduleClassesDay(scheduleClassesDayPo);
+            if (flag < 1) {
+                throw new CmdException("更新数据失败");
+            }
         }
-
-        ScheduleClassesTimePo scheduleClassesTimePo = new ScheduleClassesTimePo();
-        scheduleClassesTimePo.setScheduleId(scheduleClassesPo.getScheduleId());
-        flag = scheduleClassesTimeV1InnerServiceSMOImpl.deleteScheduleClassesTime(scheduleClassesTimePo);
-
-        if (flag < 1) {
-            throw new CmdException("更新数据失败");
+        ScheduleClassesTimeDto scheduleClassesTimeDto = new ScheduleClassesTimeDto();
+        scheduleClassesTimeDto.setScheduleId(scheduleClassesDtos.get(0).getScheduleId());
+        scheduleClassesTimeDto.setDayId(scheduleClassesDayDtos.get(0).getDayId());
+        List<ScheduleClassesTimeDto> scheduleClassesTimeDtos = scheduleClassesTimeV1InnerServiceSMOImpl.queryScheduleClassesTimes(scheduleClassesTimeDto);
+        if (scheduleClassesTimeDtos != null && scheduleClassesTimeDtos.size() == 1) {
+            ScheduleClassesTimePo scheduleClassesTimePo = new ScheduleClassesTimePo();
+            scheduleClassesTimePo.setScheduleId(scheduleClassesPo.getScheduleId());
+            flag = scheduleClassesTimeV1InnerServiceSMOImpl.deleteScheduleClassesTime(scheduleClassesTimePo);
+            if (flag < 1) {
+                throw new CmdException("更新数据失败");
+            }
         }
-
-
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

service-store/src/main/java/com/java110/store/cmd/scheduleClasses/SaveScheduleClassesCmd.java

@@ -72,76 +72,63 @@ public class SaveScheduleClassesCmd extends Cmd {
         Assert.hasKeyAndValue(reqJson, "name", "请求报文中未包含name");
         Assert.hasKeyAndValue(reqJson, "scheduleType", "请求报文中未包含scheduleType");
         Assert.hasKeyAndValue(reqJson, "scheduleCycle", "请求报文中未包含scheduleCycle");
-
-        if(!reqJson.containsKey("days")){
+        if (!reqJson.containsKey("days")) {
             throw new CmdException("未包含天");
         }
-
         JSONArray days = reqJson.getJSONArray("days");
-
-        if(days.size() <1){
+        if (days.size() < 1) {
             throw new CmdException("未包含天");
         }
-
-
         JSONObject day = null;
         JSONArray times = null;
-        for(int dayIndex = 0 ; dayIndex < days.size(); dayIndex++){
+        for (int dayIndex = 0; dayIndex < days.size(); dayIndex++) {
             day = days.getJSONObject(dayIndex);
-
-            if(ScheduleClassesDayDto.WORKDAY_NO.equals(day.getString("workday"))){
+            if (ScheduleClassesDayDto.WORKDAY_NO.equals(day.getString("workday"))) {
                 continue;
             }
-            if(!day.containsKey("times")){
+            if (!day.containsKey("times")) {
                 throw new CmdException("未包时间");
             }
             times = day.getJSONArray("times");
-            if(times.size() <1){
+            if (times.size() < 1) {
                 throw new CmdException("未包时间");
             }
-
         }
-
     }
 
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
         String storeId = cmdDataFlowContext.getReqHeaders().get("store-id");
-
         ScheduleClassesPo scheduleClassesPo = BeanConvertUtil.covertBean(reqJson, ScheduleClassesPo.class);
         scheduleClassesPo.setScheduleId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         scheduleClassesPo.setStoreId(storeId);
         scheduleClassesPo.setState(ScheduleClassesDto.STATE_START);
         scheduleClassesPo.setComputeTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B));
         int flag = scheduleClassesV1InnerServiceSMOImpl.saveScheduleClasses(scheduleClassesPo);
-
         if (flag < 1) {
             throw new CmdException("保存数据失败");
         }
-
         JSONArray days = reqJson.getJSONArray("days");
-
         JSONObject day = null;
         ScheduleClassesDayPo scheduleClassesDayPo = null;
         JSONObject time = null;
         ScheduleClassesTimePo scheduleClassesTimePo = null;
         JSONArray times = null;
-        for(int dayIndex = 0 ; dayIndex < days.size(); dayIndex++){
+        for (int dayIndex = 0; dayIndex < days.size(); dayIndex++) {
             day = days.getJSONObject(dayIndex);
             scheduleClassesDayPo = new ScheduleClassesDayPo();
             scheduleClassesDayPo.setDayId(GenerateCodeFactory.getGeneratorId("11"));
             scheduleClassesDayPo.setDay(day.getString("day"));
             scheduleClassesDayPo.setScheduleId(scheduleClassesPo.getScheduleId());
-            scheduleClassesDayPo.setWeekFlag(StringUtil.isEmpty(day.getString("weekFlag"))?"1":day.getString("weekFlag"));
+            scheduleClassesDayPo.setWeekFlag(StringUtil.isEmpty(day.getString("weekFlag")) ? "1" : day.getString("weekFlag"));
             scheduleClassesDayPo.setWorkday(day.getString("workday"));
             flag = scheduleClassesDayV1InnerServiceSMOImpl.saveScheduleClassesDay(scheduleClassesDayPo);
             if (flag < 1) {
                 throw new CmdException("保存数据失败");
             }
             times = day.getJSONArray("times");
-            for(int timeIndex = 0 ;timeIndex < times.size();timeIndex++){
+            for (int timeIndex = 0; timeIndex < times.size(); timeIndex++) {
                 time = times.getJSONObject(timeIndex);
                 scheduleClassesTimePo = new ScheduleClassesTimePo();
                 scheduleClassesTimePo.setDayId(scheduleClassesDayPo.getDayId());
@@ -155,9 +142,6 @@ public class SaveScheduleClassesCmd extends Cmd {
                 }
             }
         }
-
-
-
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

service-store/src/main/java/com/java110/store/cmd/scheduleClasses/UpdateScheduleClassesCmd.java

@@ -23,7 +23,9 @@ 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.dto.scheduleClasses.ScheduleClassesDto;
 import com.java110.dto.scheduleClassesDay.ScheduleClassesDayDto;
+import com.java110.dto.scheduleClassesTime.ScheduleClassesTimeDto;
 import com.java110.intf.store.IScheduleClassesDayV1InnerServiceSMO;
 import com.java110.intf.store.IScheduleClassesTimeV1InnerServiceSMO;
 import com.java110.intf.store.IScheduleClassesV1InnerServiceSMO;
@@ -39,6 +41,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
 
 /**
  * 类表述：更新
@@ -53,13 +56,11 @@ import org.slf4j.LoggerFactory;
 @Java110Cmd(serviceCode = "scheduleClasses.updateScheduleClasses")
 public class UpdateScheduleClassesCmd extends Cmd {
 
-  private static Logger logger = LoggerFactory.getLogger(UpdateScheduleClassesCmd.class);
-
+    private static Logger logger = LoggerFactory.getLogger(UpdateScheduleClassesCmd.class);
 
     @Autowired
     private IScheduleClassesV1InnerServiceSMO scheduleClassesV1InnerServiceSMOImpl;
 
-
     @Autowired
     private IScheduleClassesDayV1InnerServiceSMO scheduleClassesDayV1InnerServiceSMOImpl;
 
@@ -69,87 +70,90 @@ public class UpdateScheduleClassesCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "scheduleId", "scheduleId不能为空");
-
         Assert.hasKeyAndValue(reqJson, "name", "请求报文中未包含name");
         Assert.hasKeyAndValue(reqJson, "scheduleType", "请求报文中未包含scheduleType");
         Assert.hasKeyAndValue(reqJson, "scheduleCycle", "请求报文中未包含scheduleCycle");
-
-        if(!reqJson.containsKey("days")){
+        if (!reqJson.containsKey("days")) {
             throw new CmdException("未包含天");
         }
-
         JSONArray days = reqJson.getJSONArray("days");
-        if(days.size() <1){
+        if (days.size() < 1) {
             throw new CmdException("未包含天");
         }
-
         JSONObject day = null;
         JSONArray times = null;
-        for(int dayIndex = 0 ; dayIndex < days.size(); dayIndex++){
+        for (int dayIndex = 0; dayIndex < days.size(); dayIndex++) {
             day = days.getJSONObject(dayIndex);
-
-            if(ScheduleClassesDayDto.WORKDAY_NO.equals(day.getString("workday"))){
+            if (ScheduleClassesDayDto.WORKDAY_NO.equals(day.getString("workday"))) {
                 continue;
             }
-            if(!day.containsKey("times")){
+            if (!day.containsKey("times")) {
                 throw new CmdException("未包时间");
             }
             times = day.getJSONArray("times");
-            if(times.size() <1){
+            if (times.size() < 1) {
                 throw new CmdException("未包时间");
             }
-
         }
     }
 
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-       ScheduleClassesPo scheduleClassesPo = BeanConvertUtil.covertBean(reqJson, ScheduleClassesPo.class);
+        ScheduleClassesDto scheduleClassesDto = new ScheduleClassesDto();
+        scheduleClassesDto.setScheduleId(reqJson.getString("scheduleId"));
+        List<ScheduleClassesDto> scheduleClassesDtos = scheduleClassesV1InnerServiceSMOImpl.queryScheduleClassess(scheduleClassesDto);
+        Assert.listOnlyOne(scheduleClassesDtos, "查询排班信息错误！");
+        ScheduleClassesPo scheduleClassesPo = BeanConvertUtil.covertBean(reqJson, ScheduleClassesPo.class);
         int flag = scheduleClassesV1InnerServiceSMOImpl.updateScheduleClasses(scheduleClassesPo);
-
         if (flag < 1) {
             throw new CmdException("更新数据失败");
         }
-
-        ScheduleClassesDayPo scheduleClassesDayPo = new ScheduleClassesDayPo();
-        scheduleClassesDayPo.setScheduleId(scheduleClassesPo.getScheduleId());
-        flag = scheduleClassesDayV1InnerServiceSMOImpl.deleteScheduleClassesDay(scheduleClassesDayPo);
-
-        if (flag < 1) {
-            throw new CmdException("更新数据失败");
+        ScheduleClassesDayDto scheduleClassesDayDto = new ScheduleClassesDayDto();
+        scheduleClassesDayDto.setScheduleId(scheduleClassesDtos.get(0).getScheduleId());
+        List<ScheduleClassesDayDto> scheduleClassesDayDtos = scheduleClassesDayV1InnerServiceSMOImpl.queryScheduleClassesDays(scheduleClassesDayDto);
+        if (scheduleClassesDayDtos != null && scheduleClassesDayDtos.size() == 1) {
+            ScheduleClassesDayPo scheduleClassesDayPo = new ScheduleClassesDayPo();
+            scheduleClassesDayPo.setScheduleId(scheduleClassesPo.getScheduleId());
+            flag = scheduleClassesDayV1InnerServiceSMOImpl.deleteScheduleClassesDay(scheduleClassesDayPo);
+            if (flag < 1) {
+                throw new CmdException("更新数据失败");
+            }
         }
-
-        ScheduleClassesTimePo scheduleClassesTimePo = new ScheduleClassesTimePo();
-        scheduleClassesTimePo.setScheduleId(scheduleClassesPo.getScheduleId());
-        flag = scheduleClassesTimeV1InnerServiceSMOImpl.deleteScheduleClassesTime(scheduleClassesTimePo);
-
-        if (flag < 1) {
-            throw new CmdException("更新数据失败");
+        ScheduleClassesTimeDto scheduleClassesTimeDto = new ScheduleClassesTimeDto();
+        scheduleClassesTimeDto.setScheduleId(scheduleClassesDtos.get(0).getScheduleId());
+        scheduleClassesTimeDto.setDayId(scheduleClassesDayDtos.get(0).getDayId());
+        List<ScheduleClassesTimeDto> scheduleClassesTimeDtos = scheduleClassesTimeV1InnerServiceSMOImpl.queryScheduleClassesTimes(scheduleClassesTimeDto);
+        if (scheduleClassesTimeDtos != null && scheduleClassesTimeDtos.size() == 1) {
+            ScheduleClassesTimePo scheduleClassesTimePo = new ScheduleClassesTimePo();
+            scheduleClassesTimePo.setScheduleId(scheduleClassesPo.getScheduleId());
+            flag = scheduleClassesTimeV1InnerServiceSMOImpl.deleteScheduleClassesTime(scheduleClassesTimePo);
+            if (flag < 1) {
+                throw new CmdException("更新数据失败");
+            }
         }
-
         JSONArray days = reqJson.getJSONArray("days");
-
         JSONObject day = null;
         JSONObject time = null;
         JSONArray times = null;
-        for(int dayIndex = 0 ; dayIndex < days.size(); dayIndex++){
+        for (int dayIndex = 0; dayIndex < days.size(); dayIndex++) {
             day = days.getJSONObject(dayIndex);
-            scheduleClassesDayPo = new ScheduleClassesDayPo();
+            ScheduleClassesDayPo scheduleClassesDayPo = new ScheduleClassesDayPo();
+            scheduleClassesDayPo.setScheduleId(scheduleClassesPo.getScheduleId());
             scheduleClassesDayPo.setDayId(GenerateCodeFactory.getGeneratorId("11"));
             scheduleClassesDayPo.setDay(day.getString("day"));
             scheduleClassesDayPo.setScheduleId(scheduleClassesPo.getScheduleId());
-            scheduleClassesDayPo.setWeekFlag(StringUtil.isEmpty(day.getString("weekFlag"))?"1":day.getString("weekFlag"));
+            scheduleClassesDayPo.setWeekFlag(StringUtil.isEmpty(day.getString("weekFlag")) ? "1" : day.getString("weekFlag"));
             scheduleClassesDayPo.setWorkday(day.getString("workday"));
             flag = scheduleClassesDayV1InnerServiceSMOImpl.saveScheduleClassesDay(scheduleClassesDayPo);
             if (flag < 1) {
                 throw new CmdException("保存数据失败");
             }
             times = day.getJSONArray("times");
-            for(int timeIndex = 0 ;timeIndex < times.size();timeIndex++){
+            for (int timeIndex = 0; timeIndex < times.size(); timeIndex++) {
                 time = times.getJSONObject(timeIndex);
-                scheduleClassesTimePo = new ScheduleClassesTimePo();
+                ScheduleClassesTimePo scheduleClassesTimePo = new ScheduleClassesTimePo();
+                scheduleClassesTimePo.setScheduleId(scheduleClassesPo.getScheduleId());
                 scheduleClassesTimePo.setDayId(scheduleClassesDayPo.getDayId());
                 scheduleClassesTimePo.setEndTime(time.getString("endTime"));
                 scheduleClassesTimePo.setScheduleId(scheduleClassesPo.getScheduleId());
@@ -161,7 +165,6 @@ public class UpdateScheduleClassesCmd extends Cmd {
                 }
             }
         }
-
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

service-user/src/main/java/com/java110/user/cmd/user/QueryStorePrivilegeGroupCmd.java

@@ -9,7 +9,6 @@ import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.store.StoreDto;
 import com.java110.dto.user.UserDto;
 import com.java110.intf.store.IStoreV1InnerServiceSMO;
-import com.java110.intf.user.IPrivilegeGroupV1InnerServiceSMO;
 import com.java110.intf.user.IUserV1InnerServiceSMO;
 import com.java110.service.context.DataQuery;
 import com.java110.service.smo.IQueryServiceSMO;