jiangjiazhi / center

Authored by fangcheng about 9 years ago

Exists in master

Showing 6 changed files with 28 additions and 8 deletions

...	...	@@ -8,6 +8,7 @@
8	8	<result column="SOURCE_ID" property="sourceId" />
9	9	<result column="VERSION_ID" property="versionId" />
10	10	<result column="NAME" property="name" />
	11	+ <result column="SIMPLE_CODE" property="simpleCode" />
11	12	<result column="GROUPNAME" property="groupname" />
12	13	<result column="GROUPORDER" property="grouporder" />
13	14	<result column="ITEMORDER" property="itemorder" />
...	...	@@ -16,7 +17,7 @@
16	17
17	18	<!-- 通用查询结果列 -->
18	19	<sql id="Base_Column_List">
19		- ID AS id, SOURCE_ID AS sourceId, VERSION_ID AS versionId, NAME AS name, GROUPNAME AS groupname, GROUPORDER AS grouporder, ITEMORDER AS itemorder, ENABLE AS enable
	20	+ ID AS id, SOURCE_ID AS sourceId, VERSION_ID AS versionId, NAME AS name, SIMPLE_CODE as simpleCode,GROUPNAME AS groupname, GROUPORDER AS grouporder, ITEMORDER AS itemorder, ENABLE AS enable
20	21	</sql>
21	22	</mapper>

...	...	@@ -38,7 +38,15 @@
38	38	*/
39	39	@TableField(value="NAME")
40	40	private String name;
	41	+
	42	+
41	43	/**
	44	+ * 自定义高危显示名
	45	+ */
	46	+ @TableField(value="SIMPLE_CODE")
	47	+ private String simpleCode;
	48	+
	49	+ /**
42	50	* 自定义高危颜色编码
43	51	*/
44	52	@TableField(value="GROUPNAME")
...	...	@@ -123,6 +131,14 @@
123	131	public void setEnable(Integer enable) {
124	132	this.enable = enable;
125	133	}
	134	+
	135	+ public String getSimpleCode() {
	136	+ return simpleCode;
	137	+ }
	138	+
	139	+ public void setSimpleCode(String simpleCode) {
	140	+ this.simpleCode = simpleCode;
	141	+ }
126	142
127	143	}

...	...	@@ -20,13 +20,10 @@
20	20	import com.lyms.base.common.entity.user.Users;
21	21	import com.lyms.base.common.enums.PermissionEnum;
22	22	import com.lyms.base.common.service.role.PermissionsService;
23		-import com.lyms.base.common.service.user.UsersService;
24		-import com.lyms.cm.controller.sys.SysUsersController;
25	23	import com.lyms.constants.Constants;
26	24	import com.lyms.shiro.ShiroWebUtils;
27	25	import com.lyms.util.StrUtils;
28	26	import com.lyms.web.controller.BaseController;
29		-import com.qiniu.util.Json;
30	27
31	28	@Controller
32	29	public class LoginController extends BaseController {
...	...	@@ -35,8 +32,6 @@
35	32
36	33	@Autowired
37	34	private PermissionsService sysPermissionsService;
38		- @Autowired
39		- private UsersService usersService;
40	35
41	36	@RequestMapping("/")
42	37	public String index(Model model) {
...	...	@@ -84,7 +79,6 @@
84	79	public String login(String username, String password,
85	80	@RequestParam(value = "rememberMe", defaultValue = "0") int rememberMe, Model model) {
86	81	String view = VIEW_LOGIN;
87		- System.out.println(1243);
88	82	if (StrUtils.isEmpty(username) \|\| StrUtils.isEmpty(password)) {
89	83	model.addAttribute(Constants.CAPTCHA_TOKEN, StrUtils.uuid());
90	84	return view;

...	...	@@ -27,6 +27,12 @@
27	27	</div>
28	28	</div>
29	29	<div class="form-group">
	30	+ <label class="col-sm-3 control-label">搜索简码:</label>
	31	+ <div class="col-sm-8">
	32	+ <input type="text" placeholder="搜索简码" value="$!conf.simpleCode" aria-required="true" required="true" class="form-control" minlength="2" name="simpleCode" id="simpleCode">
	33	+ </div>
	34	+ </div>
	35	+ <div class="form-group">
30	36	<label class="col-sm-3 control-label">诊断组名称:</label>
31	37	<div class="col-sm-8">
32	38	<input type="text" placeholder="诊断组名称" value="$!conf.groupname" aria-required="true" required="true" class="form-control" minlength="2" name="groupname" id="groupname">

1		-token.prefix=token.user:
	1	+token.prefix=token.user.hospital:
2	2
3	3
4	4	#\u4E2D\u5FC3\u64CD\u4F5C\u63A8\u9001\u5230\u8282\u70B9