Skip to content

C
cloud-fb
Commit 788239dd by 焦凯
Options

Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

parents 74c94227 b1b0cfc0
Showing with 264 additions and 17 deletions
backend/inz.basis/src/main/java/com/beecode/inz/basis/dao/WarehouseUserDao.java
......@@ -14,4 +14,8 @@ public interface WarehouseUserDao extends BaseDao {
KObject findByUsernameOrTelephone(String username);
List<KObject> findAllByStationId(UUID stationId);
List<KObject> queryPositionByName(String phone);
List<KObject> userNameRepeatCheck(String username);
}
backend/inz.basis/src/main/java/com/beecode/inz/basis/internal/dao/WarehouseUserDaoImpl.java
......@@ -3,8 +3,11 @@ package com.beecode.inz.basis.internal.dao;
import java.util.List;
import java.util.UUID;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.query.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.orm.hibernate5.HibernateCallback;
import org.springframework.orm.hibernate5.HibernateTemplate;
import org.springframework.stereotype.Repository;
......@@ -71,4 +74,30 @@ public class WarehouseUserDaoImpl extends AbstractBaseDao implements WarehouseUs
return listByAttributes(buildSingleMap(WarehouseUserConstants.TELEPHONE, telephone));
}
@Override
public List<KObject> queryPositionByName(String phone) {
return (List<KObject>)template.execute(new HibernateCallback<List<KObject>>() {
@SuppressWarnings("unchecked")
@Override
public List<KObject> doInHibernate(Session session) throws HibernateException {
Query<KObject> query = session.createQuery("from " + WarehouseUserConstants.ENTITY + " where (discard is null or discard = 0) and (enabled = 1) and telephone =:phone ", KObject.class);
query.setParameter("phone", phone);
return query.getResultList();
}
});
}
@Override
public List<KObject> userNameRepeatCheck(String username) {
return (List<KObject>)template.execute(new HibernateCallback<List<KObject>>() {
@SuppressWarnings("unchecked")
@Override
public List<KObject> doInHibernate(Session session) throws HibernateException {
Query<KObject> query = session.createQuery("from " + WarehouseUserConstants.ENTITY + " where (discard is null or discard = 0) and (enabled = 1) and username =:username ", KObject.class);
query.setParameter("username", username);
return query.getResultList();
}
});
}
}
backend/inz.basis/src/main/java/com/beecode/inz/basis/internal/service/WarehouseUserServiceImpl.java
......@@ -199,6 +199,26 @@ public class WarehouseUserServiceImpl implements WarehouseUserService {
dao.update(entity);
}
}
@Override
public Boolean phoneRepeatCheck(String phone) {
List<KObject> list = dao.queryPositionByName(phone);
Boolean flag = false;
if (list != null && list.size() > 0 ) {
flag = true;
}
return flag;
}
@Override
public Boolean userNameRepeatCheck(String username) {
List<KObject> list = dao.userNameRepeatCheck(username);
Boolean flag = false;
if (list != null && list.size() > 0 ) {
flag = true;
}
return flag;
}
......
backend/inz.basis/src/main/java/com/beecode/inz/basis/pojo/WarehouseUser.java
......@@ -12,6 +12,7 @@ import org.springframework.security.core.userdetails.UserDetails;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.basis.config.constants.WarehouseUserConstants;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* @author pengwufeng
......@@ -111,11 +112,13 @@ public class WarehouseUser implements UserDetails, Serializable {
/**
* 创建日期
*/
@JsonFormat(pattern="yyyy-MM-dd'T'HH:mm:ss")
private Date createTime;
/**
* 修改日期
*/
@JsonFormat(pattern="yyyy-MM-dd'T'HH:mm:ss")
private Date modifyTime;
/**
......
backend/inz.basis/src/main/java/com/beecode/inz/basis/service/WarehouseUserService.java
......@@ -63,4 +63,8 @@ public interface WarehouseUserService {
*/
List<KObject> getAllByStationId(UUID stationId);
Boolean phoneRepeatCheck(String parameter);
Boolean userNameRepeatCheck(String parameter);
}
backend/inz.basis/src/main/java/com/beecode/inz/basis/web/WarehouseUserController.java
......@@ -3,6 +3,8 @@ package com.beecode.inz.basis.web;
import java.util.List;
import java.util.UUID;
import javax.servlet.http.HttpServletRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import com.beecode.bcp.core.context.AminoContextHolder;
......@@ -22,6 +25,9 @@ import com.beecode.inz.basis.pojo.WarehouseUser;
import com.beecode.inz.basis.service.WarehouseUserService;
import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.beecode.inz.basis.util.JsonUtil;
import com.beecode.xlib.json.JSONException;
import com.beecode.xlib.json.JSONObject;
import com.beecode.xlib.runtime.Assert;
import com.beecode.xlib.utils.StringUtil;
/**
......@@ -36,6 +42,9 @@ public class WarehouseUserController {
@Autowired
private WarehouseUserService warehouseUserService;
@Autowired
private HttpServletRequest request;
/**
* 创建场站用户
......@@ -86,6 +95,52 @@ public class WarehouseUserController {
}
/**
* 根据id查询用户
* @param obj
* @return
*/
@GetMapping("/warehouse/user/queryById/{id}")
public Object queryById(@PathVariable(name="id") String id) {
if(StringUtil.isEmpty(id)) {
return ResponseObj.error("id不能为空");
}
try {
WarehouseUser warehouseUser = warehouseUserService.getById(UUID.fromString(id));
return ResponseObj.success("操作成功", warehouseUser);
} catch (IllegalArgumentException e) {
return ResponseObj.error("stationId错误");
} catch (Exception e) {
return ResponseObj.error("操作失败");
}
}
/**
* 编辑
* @param obj
* @return
*/
@PostMapping("/warehouse/user/modify")
public Object modify(@RequestBody String body) {
if(StringUtil.isEmpty(body)) {
return ResponseObj.error("参数不能为空");
}
WarehouseUser warehouseUser = JsonUtil.jsonToBean(body, WarehouseUser.class);
if(warehouseUser == null) {
return ResponseObj.error("参数无法识别");
}
try {
warehouseUserService.modify(warehouseUser);
} catch(Exception e) {
logger.error("", e);
return ResponseObj.error(e.getMessage());
}
return ResponseObj.success("操作成功",null);
}
/**
* 创建场站用户
*
* @param obj
......@@ -110,4 +165,42 @@ public class WarehouseUserController {
return Integer.toString(HttpStatus.OK.value());
}
/**
* 用户名,手机号校验重复
*
* @param obj
* @return
*/
@ResponseBody
@RequestMapping(value = "/warehouse/user/verify", method = RequestMethod.PUT)
public Object verify(@RequestBody String body){
Assert.notNull(body, "The body must not be null");
String operation = request.getHeader("operation");
Assert.notNull(operation, "'operation' must not be null");
String parameter = null;
JSONObject object;
try {
object = new JSONObject(body);
parameter = object.optString("parameter",null);
} catch (JSONException e) {
e.printStackTrace();
}
switch (operation) {
case "PHONE_CHECK":
// 手机号重复查询 true为重复
Boolean phoneResult = warehouseUserService.phoneRepeatCheck(parameter);
if(phoneResult){
return ResponseObj.error("手机号码重复");
}
case "USERNAME_CHECK":
Boolean userNameResult = warehouseUserService.userNameRepeatCheck(parameter);
if(userNameResult){
return ResponseObj.error("账号重复");
}
default:
return null;
}
}
}
backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/DefaultFunctionTree.jmx
......@@ -1134,20 +1134,6 @@
<m:icon>ivu-icon ivu-icon-ios-cog</m:icon>
</m:function-node>
<m:function-node>
<m:id>a0fbf7fb-1ee5-465e-8e0d-41196cc0c081</m:id>
<m:name>postManage</m:name>
<m:title>岗位管理</m:title>
<m:index>7000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:role></m:role>
<m:function-definition>
<m:view>function-post-manage</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>ivu-icon ivu-icon-ios-cog</m:icon>
</m:function-node>
<m:function-node>
<m:id>6931d79c-6a8c-4735-8daa-ef99e52e1304</m:id>
<m:name>camera_list</m:name>
<m:title>摄像头管理</m:title>
......@@ -1288,6 +1274,20 @@
</m:function-definition>
<m:icon>iconfont icongongnengquanxian</m:icon>
</m:function-node>
<m:function-node>
<m:id>a0fbf7fb-1ee5-465e-8e0d-41196cc0c081</m:id>
<m:name>postManage</m:name>
<m:title>岗位管理</m:title>
<m:index>7000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:role></m:role>
<m:function-definition>
<m:view>function-post-manage</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>ivu-icon ivu-icon-ios-cog</m:icon>
</m:function-node>
<m:function-node>
<m:id>c6daeb0c-5caf-4266-8a18-aa7b1e4a4125</m:id>
<m:name>dictMgr</m:name>
......
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/DinasTypeDaoImpl.java
......@@ -24,10 +24,10 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
@Autowired
private HibernateTemplate template;
private String insertOrUpdateDinasTypeStationHql=" inz_kunlun01.xyst_dinas_biz_station_dinas_type " +
private String insertOrUpdateDinasTypeStationHql=" xyst_dinas_biz_station_dinas_type " +
"set station_id = :stationId , dinas_type_id =:dinasTypeId ";
private String deleteOrSelectDinasTypeStationHql=" from inz_kunlun01.xyst_dinas_biz_station_dinas_type " +
private String deleteOrSelectDinasTypeStationHql=" from xyst_dinas_biz_station_dinas_type " +
"where station_id= :stationId and dinas_type_id=:dinasTypeId";
/**
......
backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/bill/Station.mk 0 → 100644
<model>
<header>
<type>bcp.biz.Bill</type>
<package>com.xyst.dinas.biz.bill</package>
<title>场站</title>
<name>Station</name>
<description>场站</description>
</header>
<content>
<bill>
<data>
{"baseData":{"name":"Station","title":"场站","billModel":"com.beecode.bap.biztrait.BasicBillBiztrait","functionLibrarys":[],"description":"场站","dataModel":"com.xyst.dinas.biz.datamodel.Station"},"serial":{"serialData":[{"segment":"literal","segmentData":"EM"},{"segment":"sequence","segmentData":{"start-with":0,"increment":1,"min":0,"max":99999,"length":5,"cycle":true,"cut-direction":"left","pad-string":"0","pad-direction":"left","cache-size":10}}],"buildTime":"add"},"formula":[],"workflow":{"workflow":"","processParamConfig":[]},"print":[],"authority":[]}
</data>
</bill>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station$sequence.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>74af0162-d2f8-4761-ba64-51dd1a4cfa29</id>
<name>com.xyst.dinas.biz.bill.Station$sequence</name>
<title>场站$sequence</title>
<description>场站</description>
<define>bcp.sequence</define>
<define-version>1.0</define-version>
<content>
<m:sequence>
<m:start-with>0</m:start-with>
<m:increment>1</m:increment>
<m:max>99999</m:max>
<m:min>0</m:min>
<m:cycle>true</m:cycle>
<m:cache-size>10</m:cache-size>
</m:sequence>
</content>
</metadata>
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station$serial.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>eabc5787-8607-4b02-9a35-78f679b41418</id>
<name>com.xyst.dinas.biz.bill.Station$serial</name>
<title>场站$serial</title>
<description>场站</description>
<define>bcp.serial</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.biz.datamodel.Station</dependency>
<dependency>com.xyst.dinas.biz.bill.Station$sequence</dependency>
<content>
<m:serial>
<m:input>com.xyst.dinas.biz.datamodel.Station</m:input>
<m:functionLibrarys/>
<m:segments>
<m:literal>
<m:value>EM</m:value>
</m:literal>
<m:sequence>
<m:length>5</m:length>
<m:pad-direction>left</m:pad-direction>
<m:pad-string>0</m:pad-string>
<m:key>com.xyst.dinas.biz.bill.Station$serial</m:key>
<m:sequenceName>com.xyst.dinas.biz.bill.Station$sequence</m:sequenceName>
</m:sequence>
</m:segments>
</m:serial>
</content>
</metadata>
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>d448c109-3a1d-439e-b117-e3dceb0f236c</id>
<name>com.xyst.dinas.biz.bill.Station</name>
<title>场站</title>
<description>场站</description>
<define>bcp.biz.Biztype</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.biz.bill.Station$serial</dependency>
<dependency>com.xyst.dinas.biz.datamodel.Station</dependency>
<dependency>com.beecode.bap.biztrait.BasicBillBiztrait</dependency>
<content>
<m:biztype>
<m:type>com.xyst.dinas.biz.datamodel.Station</m:type>
<m:inheritances>
<m:inheritance>
<m:biztrait>com.beecode.bap.biztrait.BasicBillBiztrait</m:biztrait>
<m:config type="xml">
<m:content>&lt;billBasictraitConfig&gt;&lt;formulas/&gt;&lt;parents&gt;&lt;parent&gt;&lt;billCodeConfig&gt;&lt;serialName&gt;com.xyst.dinas.biz.bill.Station$serial&lt;/serialName&gt;&lt;buildTime&gt;add&lt;/buildTime&gt;&lt;/billCodeConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;workflowConfig&gt;&lt;workflow&gt;&lt;/workflow&gt;&lt;/workflowConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;printConfig&gt;&lt;templates/&gt;&lt;/printConfig&gt;&lt;/parent&gt;&lt;/parents&gt;&lt;functionLibrarys/&gt;&lt;/billBasictraitConfig&gt;</m:content>
</m:config>
</m:inheritance>
</m:inheritances>
<m:methodAuthorityItems/>
</m:biztype>
</content>
</metadata>
backend/xyst.dinas.oa/src/main/java/com/xyst/dinas/oa/enumeration/SecurityClassificationEnum.java
package com.xyst.dinas.oa.enumeration;
/**
* 出差带队人职务级别
* 保密级别
*
*/
public enum SecurityClassificationEnum {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment